HDFFV-10845, 10529 and CMake changes from develop

1 files changed, 5 insertions, 40 deletions

diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake
index 5f02c9f..b94fc88 100644
--- a/test/CMakeVFDTests.cmake
+++ b/test/CMakeVFDTests.cmake
@@ -91,15 +91,9 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
     if ("${vfdtest}" STREQUAL "flush1" OR "${vfdtest}" STREQUAL "flush2")
       if ("${vfdname}" STREQUAL "multi" OR "${vfdname}" STREQUAL "split")
         if (NOT BUILD_SHARED_LIBS AND NOT HDF_CFG_NAME MATCHES "Debug")
-          add_test (
-              NAME VFD-${vfdname}-${vfdtest}-clear-objects
-              COMMAND    ${CMAKE_COMMAND}
-                  -E remove
-                      ${vfdname}/${vfdname}-${vfdtest}.out
-                      ${vfdname}/${vfdname}-${vfdtest}.out.err
-          )
           add_test (NAME VFD-${vfdname}-${vfdtest}
               COMMAND "${CMAKE_COMMAND}"
+                  -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                   -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
                   -D "TEST_ARGS:STRING="
                   -D "TEST_VFD:STRING=${vfdname}"
@@ -109,7 +103,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
                   -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
           )
           set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES
-              DEPENDS VFD-${vfdname}-${vfdtest}-clear-objects
               ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}"
               WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
           )
@@ -119,15 +112,9 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
           )
         endif ()
       else ()
-        add_test (
-            NAME VFD-${vfdname}-${vfdtest}-clear-objects
-            COMMAND    ${CMAKE_COMMAND}
-                -E remove
-                    ${vfdname}/${vfdname}-${vfdtest}.out
-                    ${vfdname}/${vfdname}-${vfdtest}.out.err
-        )
         add_test (NAME VFD-${vfdname}-${vfdtest}
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
                 -D "TEST_ARGS:STRING="
                 -D "TEST_VFD:STRING=${vfdname}"
@@ -137,21 +124,14 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
                 -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
         )
         set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES
-            DEPENDS VFD-${vfdname}-${vfdtest}-clear-objects
             ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}"
             WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
         )
       endif ()
     else ()
-      add_test (
-          NAME VFD-${vfdname}-${vfdtest}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  ${vfdname}/${vfdname}-${vfdtest}.out
-                  ${vfdname}/${vfdname}-${vfdtest}.out.err
-      )
       add_test (NAME VFD-${vfdname}-${vfdtest}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
               -D "TEST_ARGS:STRING="
               -D "TEST_VFD:STRING=${vfdname}"
@@ -161,7 +141,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
               -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
       )
       set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES
-          DEPENDS VFD-${vfdname}-${vfdtest}-clear-objects
           ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
           WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
       )
@@ -169,15 +148,9 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
   endmacro ()
 
   macro (DO_VFD_TEST vfdtest vfdname resultcode)
-    add_test (
-        NAME VFD-${vfdname}-${vfdtest}-clear-objects
-        COMMAND    ${CMAKE_COMMAND}
-            -E remove
-                ${vfdname}/${vfdname}-${vfdtest}.out
-                ${vfdname}/${vfdname}-${vfdtest}.out.err
-    )
     add_test (NAME VFD-${vfdname}-${vfdtest}
         COMMAND "${CMAKE_COMMAND}"
+            -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
             -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
             -D "TEST_ARGS:STRING="
             -D "TEST_VFD:STRING=${vfdname}"
@@ -187,7 +160,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
             -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
     )
     set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES
-        DEPENDS VFD-${vfdname}-${vfdtest}-clear-objects
         ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}"
         WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
     )
@@ -211,15 +183,9 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
       set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
     endif ()
     if (HDF5_TEST_FHEAP_VFD)
-      add_test (
-          NAME VFD-${vfdname}-fheap-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  ${vfdname}/${vfdname}-fheap.out
-                  ${vfdname}/${vfdname}-fheap.out.err
-      )
       add_test (NAME VFD-${vfdname}-fheap
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:fheap>"
               -D "TEST_ARGS:STRING="
               -D "TEST_VFD:STRING=${vfdname}"
@@ -229,7 +195,6 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
               -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
       )
       set_tests_properties (VFD-${vfdname}-fheap PROPERTIES
-          DEPENDS VFD-${vfdname}-fheap-clear-objects
           TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
           ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
           WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}