Merge of HDFFV-10845, 10529 from develop

1 files changed, 169 insertions, 251 deletions

diff --git a/tools/h5repack/CMakeTests.cmake b/tools/h5repack/CMakeTests.cmake
index dec0a54..fa1faf9 100644
--- a/tools/h5repack/CMakeTests.cmake
+++ b/tools/h5repack/CMakeTests.cmake
@@ -16,39 +16,6 @@
 ##############################################################################
 ##############################################################################
 
-  if (HDF5_TEST_VFD)
-    set (VFD_LIST
-        sec2
-        stdio
-        core
-        split
-        multi
-        family
-    )
-
-    if (DIRECT_VFD)
-      set (VFD_LIST ${VFD_LIST} direct)
-    endif ()
-
-    macro (ADD_VFD_TEST vfdname resultcode)
-      add_test (
-        NAME H5REPACK-VFD-${vfdname}-h5repacktest
-        COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_PROGRAM=$<TARGET_FILE:h5repacktest>"
-            -D "TEST_ARGS:STRING="
-            -D "TEST_VFD:STRING=${vfdname}"
-            -D "TEST_EXPECT=${resultcode}"
-            -D "TEST_OUTPUT=h5repacktest"
-            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-            -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
-      )
-      if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5REPACK-VFD-${vfdname}-h5repacktest PROPERTIES DEPENDS ${last_test})
-      endif ()
-      set (last_test "H5REPACK-VFD-${vfdname}-h5repacktest")
-    endmacro ()
-  endif ()
-
   # --------------------------------------------------------------------
   # Copy all the HDF5 files from the source directory into the test directory
   # --------------------------------------------------------------------
@@ -143,30 +110,25 @@
 ##############################################################################
 ##############################################################################
 
+  if (NOT BUILD_SHARED_LIBS)
+    set (tgt_ext "")
+  else ()
+    set (tgt_ext "-shared")
+  endif ()
+
   macro (ADD_HELP_TEST testname resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5REPACK-h5repack-${testname} COMMAND $<TARGET_FILE:h5repack> ${ARGN})
-      set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      if (last_test)
-        set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES DEPENDS ${last_test})
-      endif ()
-      set (last_test "H5REPACK-h5repack-${testname}")
-    else ()
-      add_test (
-          NAME H5REPACK-h5repack-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/h5repack-${testname}.out
-              testfiles/h5repack-${testname}.out.err
+      add_test (NAME H5REPACK-h5repack-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN})
+      set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
       )
-      if (last_test)
-        set_tests_properties (H5REPACK-h5repack-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
+    else ()
       add_test (
           NAME H5REPACK-h5repack-${testname}
           COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5repack${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_OUTPUT=h5repack-${testname}.out"
@@ -174,39 +136,43 @@
               -D "TEST_REFERENCE=h5repack-${testname}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES DEPENDS H5REPACK-h5repack-${testname}-clear-objects)
     endif ()
+    set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES
+        FIXTURES_REQUIRED clear_h5repack
+    )
   endmacro ()
 
   macro (ADD_H5_TEST_OLD testname testtype testfile)
-    if ("${testtype}" STREQUAL "SKIP")
-      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      if ("${testtype}" STREQUAL "SKIP")
         add_test (
             NAME H5REPACK_OLD-${testname}
             COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}"
         )
         set_property(TEST H5REPACK_OLD-${testname} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5REPACK_OLD-${testname}-clear-objects
+            COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
+        )
+        set_tests_properties (H5REPACK_OLD-${testname}-clear-objects PROPERTIES
+            FIXTURES_REQUIRED clear_h5repack
+        )
+        add_test (
+            NAME H5REPACK_OLD-${testname}
+            COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+        )
+        set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES
+            DEPENDS H5REPACK_OLD-${testname}-clear-objects
+        )
+        add_test (
+            NAME H5REPACK_OLD-${testname}_DFF
+            COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+        )
+        set_tests_properties (H5REPACK_OLD-${testname}_DFF PROPERTIES
+            DEPENDS H5REPACK_OLD-${testname}
+        )
       endif ()
-    else ()
-      add_test (
-          NAME H5REPACK_OLD-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/out-${testname}.${testfile}
-      )
-      if (last_test)
-        set_tests_properties (H5REPACK_OLD-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
-      add_test (
-          NAME H5REPACK_OLD-${testname}
-          COMMAND $<TARGET_FILE:h5repack> ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
-      )
-      set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES DEPENDS H5REPACK_OLD-${testname}-clear-objects)
-      add_test (
-          NAME H5REPACK_OLD-${testname}_DFF
-          COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
-      )
-      set_tests_properties (H5REPACK_OLD-${testname}_DFF PROPERTIES DEPENDS H5REPACK_OLD-${testname})
     endif ()
   endmacro ()
 
@@ -222,23 +188,25 @@
     else ()
       add_test (
           NAME H5REPACK-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/out-${testname}.${testfile}
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
+      )
+      set_tests_properties (H5REPACK-${testname}-clear-objects PROPERTIES
+          FIXTURES_REQUIRED clear_h5repack
       )
-      if (last_test)
-        set_tests_properties (H5REPACK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
       add_test (
           NAME H5REPACK-${testname}
-          COMMAND $<TARGET_FILE:h5repack> --enable-error-stack ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> --enable-error-stack ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+      )
+      set_tests_properties (H5REPACK-${testname} PROPERTIES
+          DEPENDS H5REPACK-${testname}-clear-objects
       )
-      set_tests_properties (H5REPACK-${testname} PROPERTIES DEPENDS H5REPACK-${testname}-clear-objects)
       add_test (
           NAME H5REPACK-${testname}_DFF
           COMMAND $<TARGET_FILE:h5diff> --enable-error-stack ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
       )
-      set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES DEPENDS H5REPACK-${testname})
+      set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES
+          DEPENDS H5REPACK-${testname}
+      )
     endif ()
   endmacro ()
 
@@ -256,27 +224,21 @@
       if (HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_CMP-${testname}
-            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
+            COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
         )
-        if (last_test)
-          set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS ${last_test})
-        endif ()
       else ()
         add_test (
             NAME H5REPACK_CMP-${testname}-clear-objects
-            COMMAND    ${CMAKE_COMMAND}
-                -E remove
-                testfiles/out-${testname}.${resultfile}
-                testfiles/${resultfile}-${testname}.out
-                testfiles/${resultfile}-${testname}.out.err
+            COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
+        )
+        set_tests_properties (H5REPACK_CMP-${testname}-clear-objects PROPERTIES
+            FIXTURES_REQUIRED clear_h5repack
         )
-        if (last_test)
-          set_tests_properties (H5REPACK_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-        endif ()
         add_test (
             NAME H5REPACK_CMP-${testname}
             COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5repack${tgt_ext}>"
                 -D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                 -D "TEST_OUTPUT=${resultfile}-${testname}.out"
@@ -285,12 +247,14 @@
                 -D "TEST_REFERENCE=${resultfile}-${testname}.tst"
                 -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
         )
-        set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS H5REPACK_CMP-${testname}-clear-objects)
+        set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES
+            DEPENDS H5REPACK_CMP-${testname}-clear-objects
+        )
       endif ()
     endif ()
   endmacro ()
 
-  macro (ADD_H5_MASK_TEST testname testtype resultcode resultfile)
+  macro (ADD_H5_MASK_TEST testname testtype resultcode result_errcheck resultfile)
     if ("${testtype}" STREQUAL "SKIP")
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
@@ -304,35 +268,32 @@
       if (HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_MASK-${testname}
-            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
+            COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
+        )
+        set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES
+            FIXTURES_REQUIRED clear_h5repack
         )
-        if (last_test)
-          set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS ${last_test})
-        endif ()
       else (HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_MASK-${testname}-clear-objects
-            COMMAND    ${CMAKE_COMMAND}
-                -E remove
-                testfiles/out-${testname}.${resultfile}
-                testfiles/${resultfile}-${testname}.out
-                testfiles/${resultfile}-${testname}.out.err
+            COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
+        )
+        set_tests_properties (H5REPACK_MASK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test}
+            FIXTURES_REQUIRED clear_h5repack
         )
-        if (last_test)
-          set_tests_properties (H5REPACK_MASK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-        endif ()
         add_test (
             NAME H5REPACK_MASK-${testname}
             COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5repack${tgt_ext}>"
                 -D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                 -D "TEST_OUTPUT=${resultfile}-${testname}.out"
                 -D "TEST_EXPECT=${resultcode}"
-                -D "TEST_MASK_ERROR=true"
+                -D "TEST_SKIP_COMPARE=true"
                 -D "TEST_REFERENCE=${resultfile}.mty"
-                -D "TEST_ERRREF=${resultfile}-${testname}.tst"
-                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+                -D "TEST_ERRREF=${result_errcheck}"
+                -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
         )
         set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS H5REPACK_MASK-${testname}-clear-objects)
       endif ()
@@ -351,25 +312,24 @@
     else ()
       add_test (
           NAME H5REPACK_DMP-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/out-${testname}.${resultfile}
-              testfiles/${resultfile}-${testname}.out
-              testfiles/${resultfile}-${testname}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
+      )
+      set_tests_properties (H5REPACK_DMP-${testname}-clear-objects PROPERTIES
+          FIXTURES_REQUIRED clear_h5repack
       )
-      if (last_test)
-        set_tests_properties (H5REPACK_DMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
       add_test (
           NAME H5REPACK_DMP-${testname}
-          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
+      )
+      set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES
+          DEPENDS H5REPACK_DMP-${testname}-clear-objects
       )
-      set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DEPENDS H5REPACK_DMP-${testname}-clear-objects)
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_DMP-h5dump-${testname}
             COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
                 -D "TEST_ARGS:STRING=-q;creation_order;-pH;out-${testname}.${resultfile}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                 -D "TEST_OUTPUT=${resultfile}-${testname}.out"
@@ -377,7 +337,9 @@
                 -D "TEST_REFERENCE=${testname}.${resultfile}.ddl"
                 -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
         )
-        set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DEPENDS "H5REPACK_DMP-${testname}")
+        set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES
+            DEPENDS "H5REPACK_DMP-${testname}"
+        )
       endif ()
     endif ()
   endmacro ()
@@ -394,25 +356,24 @@
     else ()
       add_test (
           NAME H5REPACK_STAT-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/out-${statarg}.${resultfile}
-              testfiles/${resultfile}-${testname}.out
-              testfiles/${resultfile}-${testname}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${statarg}.${resultfile}
+      )
+      set_tests_properties (H5REPACK_STAT-${testname}-clear-objects PROPERTIES
+          FIXTURES_REQUIRED clear_h5repack
       )
-      if (last_test)
-        set_tests_properties (H5REPACK_STAT-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
       add_test (
           NAME H5REPACK_STAT-${testname}
-          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${statarg}.${resultfile}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${statarg}.${resultfile}
+      )
+      set_tests_properties (H5REPACK_STAT-${testname} PROPERTIES
+          DEPENDS H5REPACK_STAT-${testname}-clear-objects
       )
-      set_tests_properties (H5REPACK_STAT-${testname} PROPERTIES DEPENDS H5REPACK_STAT-${testname}-clear-objects)
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_STAT-h5stat-${testname}
             COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5stat>"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5stat${tgt_ext}>"
                 -D "TEST_ARGS:STRING=-S;-s;out-${statarg}.${resultfile}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                 -D "TEST_OUTPUT=${resultfile}-${testname}.out"
@@ -420,7 +381,9 @@
                 -D "TEST_REFERENCE=${statarg}.${resultfile}.ddl"
                 -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
         )
-        set_tests_properties (H5REPACK_STAT-h5stat-${testname} PROPERTIES DEPENDS "H5REPACK_STAT-${testname}")
+        set_tests_properties (H5REPACK_STAT-h5stat-${testname} PROPERTIES
+            DEPENDS "H5REPACK_STAT-${testname}"
+        )
       endif ()
     endif ()
   endmacro ()
@@ -438,30 +401,31 @@
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects
-            COMMAND    ${CMAKE_COMMAND}
-                -E remove
-                testfiles/out-${testname}.${testfile}
-                testfiles/${testfile}-${testname}-v.out
-                testfiles/${testfile}-${testname}-v.out.err
+            COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile}
+        )
+        set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects PROPERTIES
+            FIXTURES_REQUIRED clear_h5repack
         )
-        if (last_test)
-          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-        endif ()
         add_test (
             NAME H5REPACK_VERIFY_LAYOUT-${testname}
-            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+            COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+        )
+        set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES
+            DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects
         )
-        set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects)
         add_test (
             NAME H5REPACK_VERIFY_LAYOUT-${testname}_DFF
-            COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+            COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+        )
+        set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DFF PROPERTIES
+            DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}
         )
-        set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DFF PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname})
         if (NOT ${resultcode})
           add_test (
               NAME H5REPACK_VERIFY_LAYOUT-${testname}_DMP
               COMMAND "${CMAKE_COMMAND}"
-                  -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+                  -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+                  -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
                   -D "TEST_ARGS:STRING=-d;${testdset};-pH;out-${testname}.${testfile}"
                   -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                   -D "TEST_OUTPUT=${testfile}-${testname}-v.out"
@@ -470,7 +434,9 @@
                   -D "TEST_REFERENCE=${testfilter}"
                   -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
           )
-          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF)
+          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES
+              DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF
+          )
         else ()
           if ("${testfilter}" STREQUAL "CHUNKED")
             set (nottestfilter "(CONTIGUOUS|COMPACT)")
@@ -484,7 +450,8 @@
           add_test (
               NAME H5REPACK_VERIFY_LAYOUT-${testname}_DMP
               COMMAND "${CMAKE_COMMAND}"
-                  -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+                  -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+                  -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
                   -D "TEST_ARGS:STRING=-pH;out-${testname}.${testfile}"
                   -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                   -D "TEST_OUTPUT=${testfile}-${testname}-v.out"
@@ -493,7 +460,9 @@
                   -D "TEST_REFERENCE=${testfilter}"
                   -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
           )
-          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF)
+          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES
+              DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF
+          )
         endif ()
       endif ()
     endif ()
@@ -503,28 +472,33 @@
       # Remove any output file left over from previous test run
       add_test (
           NAME H5REPACK_META-${testname}_N-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
+          COMMAND ${CMAKE_COMMAND} -E remove
               testfiles/out-${testname}_N.${testname}.h5
               testfiles/out-${testname}_M.${testname}.h5
       )
-      if (last_test)
-        set_tests_properties (H5REPACK_META-${testname}_N-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
+      set_tests_properties (H5REPACK_META-${testname}_N-clear-objects PROPERTIES
+          FIXTURES_REQUIRED clear_h5repack
+      )
       add_test (
           NAME H5REPACK_META-${testname}_N
-          COMMAND $<TARGET_FILE:h5repack> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5
+      )
+      set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES
+          DEPENDS H5REPACK_META-${testname}_N-clear-objects
       )
-      set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES DEPENDS H5REPACK_META-${testname}_N-clear-objects)
       add_test (
           NAME H5REPACK_META-${testname}_M
-          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5
+      )
+      set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES
+          DEPENDS H5REPACK_META-${testname}_N
       )
-      set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES DEPENDS H5REPACK_META-${testname}_N)
 
       add_test (NAME H5REPACK_META-${testname} COMMAND ${CMAKE_COMMAND} -E compare_files ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5 ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5)
-      set_tests_properties (H5REPACK_META-${testname} PROPERTIES WILL_FAIL "true")
-      set_tests_properties (H5REPACK_META-${testname} PROPERTIES DEPENDS H5REPACK_META-${testname}_M)
+      set_tests_properties (H5REPACK_META-${testname} PROPERTIES
+          WILL_FAIL "true"
+          DEPENDS H5REPACK_META-${testname}_M
+      )
   endmacro ()
 
   macro (ADD_H5_UD_TEST testname resultcode resultfile)
@@ -532,21 +506,16 @@
       # Remove any output file left over from previous test run
       add_test (
           NAME H5REPACK_UD-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/out-${testname}.${resultfile}
-              testfiles/${testname}.${resultfile}.out
-              testfiles/${testname}.${resultfile}.out.err
-              testfiles/${resultfile}-${testname}.out
-              testfiles/${resultfile}-${testname}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile}
+      )
+      set_tests_properties (H5REPACK_UD-${testname}-clear-objects PROPERTIES
+          FIXTURES_REQUIRED clear_h5repack
       )
-      if (last_test)
-        set_tests_properties (H5REPACK_UD-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
       add_test (
           NAME H5REPACK_UD-${testname}
           COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5repack-shared>"
               -D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_EXPECT=${resultcode}"
@@ -555,13 +524,17 @@
               -D "TEST_REFERENCE=${testname}.${resultfile}.tst"
               -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
               -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
+              -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5REPACK_UD-${testname} PROPERTIES DEPENDS H5REPACK_UD-${testname}-clear-objects)
+      set_tests_properties (H5REPACK_UD-${testname} PROPERTIES
+          DEPENDS H5REPACK_UD-${testname}-clear-objects
+      )
       add_test (
           NAME H5REPACK_UD-${testname}-h5dump
           COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump-shared>"
               -D "TEST_ARGS:STRING=-pH;out-${testname}.${resultfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_OUTPUT=${resultfile}-${testname}.out"
@@ -569,9 +542,12 @@
               -D "TEST_REFERENCE=${resultfile}-${testname}.ddl"
               -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
               -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
+              -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5REPACK_UD-${testname}-h5dump PROPERTIES DEPENDS "H5REPACK_UD-${testname}")
+      set_tests_properties (H5REPACK_UD-${testname}-h5dump PROPERTIES
+          DEPENDS "H5REPACK_UD-${testname}"
+      )
     endif ()
   endmacro ()
 
@@ -609,67 +585,6 @@
   if (HDF5_ENABLE_USING_MEMCHECKER)
     # Remove any output file left over from previous test run
     set (LIST_TO_CLEAR
-        h5dump-help.out
-        h5repack_layout.h5-chunk_18x13-v.out
-        h5repack_layout.h5-chunk_18x13-v.out.err
-        h5repack_layout.h5-chunk_20x10-v.out
-        h5repack_layout.h5-chunk_20x10-v.out.err
-        h5repack_layout.h5-chunk_compa-v.out
-        h5repack_layout.h5-chunk_compa-v.out.err
-        h5repack_layout.h5-chunk_conti-v.out
-        h5repack_layout.h5-chunk_conti-v.out.err
-        h5repack_layout.h5-compa-v.out
-        h5repack_layout.h5-compa-v.out.err
-        h5repack_layout.h5-conti-v.out
-        h5repack_layout.h5-conti-v.out.err
-        h5repack_layout.h5-deflate_limit.out
-        h5repack_layout.h5-deflate_limit.out.err
-        h5repack_layout.h5-dset2_chunk_20x10-v.out
-        h5repack_layout.h5-dset2_chunk_20x10-v.out.err
-        h5repack_layout.h5-dset2_chunk_20x10-errstk.out
-        h5repack_layout.h5-dset2_chunk_20x10-errstk.out.err
-        h5repack_layout.h5-dset2_compa-v.out
-        h5repack_layout.h5-dset2_compa-v.out.err
-        h5repack_layout.h5-dset2_conti-v.out
-        h5repack_layout.h5-dset2_conti-v.out.err
-        h5repack_layout.h5-dset_compa_chunk-v.out
-        h5repack_layout.h5-dset_compa_chunk-v.out.err
-        h5repack_layout.h5-dset_compa_compa-v.out
-        h5repack_layout.h5-dset_compa_compa-v.out.err
-        h5repack_layout.h5-dset_compa_conti-v.out
-        h5repack_layout.h5-dset_compa_conti-v.out.err
-        h5repack_layout.h5-dset_conti_chunk-v.out
-        h5repack_layout.h5-dset_conti_chunk-v.out.err
-        h5repack_layout.h5-dset_conti_compa-v.out
-        h5repack_layout.h5-dset_conti_compa-v.out.err
-        h5repack_layout.h5-dset_conti_conti-v.out
-        h5repack_layout.h5-dset_conti_conti-v.out.err
-        h5repack_layout.h5-layout_long_switches-v.out
-        h5repack_layout.h5-layout_long_switches-v.out.err
-        h5repack_layout.h5-layout_short_switches-v.out
-        h5repack_layout.h5-layout_short_switches-v.out.err
-        h5repack_layout.h5-plugin_test.out
-        h5repack_layout.h5-plugin_test.out.err
-        h5repack_layout2.h5-contig_small_compa-v.out
-        h5repack_layout2.h5-contig_small_compa-v.out.err
-        h5repack_layout2.h5-contig_small_fixed_compa-v.out
-        h5repack_layout2.h5-contig_small_fixed_compa-v.out.err
-        h5repack_layout3.h5-ckdim_biger-v.out
-        h5repack_layout3.h5-ckdim_biger-v.out.err
-        h5repack_layout3.h5-ckdim_smaller-v.out
-        h5repack_layout3.h5-ckdim_smaller-v.out.err
-        h5repack_layout3.h5-chunk2chunk-v.out
-        h5repack_layout3.h5-chunk2chunk-v.out.err
-        h5repack_layout3.h5-chunk2compa-v.out
-        h5repack_layout3.h5-chunk2compa-v.out.err
-        h5repack_layout3.h5-chunk2conti-v.out
-        h5repack_layout3.h5-chunk2conti-v.out.err
-        h5repack_layout3.h5-error1-v.out
-        h5repack_layout3.h5-error1-v.out.err
-        h5repack_layout3.h5-error2-v.out
-        h5repack_layout3.h5-error2-v.out.err
-        h5repack_layout3.h5-error3-v.out
-        h5repack_layout3.h5-error3-v.out.err
         out-family.tfamily%05d.h5
         out-HDFFV-7840.h5diff_attr1.h5
         out-attr.h5repack_attr.h5
@@ -773,15 +688,15 @@
         NAME H5REPACK-clearall-objects
         COMMAND ${CMAKE_COMMAND} -E remove ${LIST_TO_CLEAR}
     )
-    set_tests_properties (H5REPACK-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-    if (last_test)
-      set_tests_properties (H5REPACK-clearall-objects PROPERTIES DEPENDS ${last_test})
-    endif ()
+    set_tests_properties (H5REPACK-clearall-objects PROPERTIES
+        FIXTURES_SETUP clear_h5repack
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+    )
   endif ()
 
   ADD_HELP_TEST(help 0 -h)
 
-  add_test (NAME H5REPACK-testh5repack_detect_szip COMMAND $<TARGET_FILE:testh5repack_detect_szip>)
+  add_test (NAME H5REPACK-testh5repack_detect_szip COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testh5repack_detect_szip>)
   if (HDF5_ENABLE_SZIP_SUPPORT)
     if (HDF5_ENABLE_SZIP_ENCODING)
       set (passRegex "yes")
@@ -796,7 +711,7 @@
   endif ()
   set_tests_properties (H5REPACK-testh5repack_detect_szip PROPERTIES DEPENDS H5REPACK-clearall-objects)
 
-  add_test (NAME H5REPACK-h5repacktest COMMAND $<TARGET_FILE:h5repacktest>)
+  add_test (NAME H5REPACK-h5repacktest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repacktest>)
   set_tests_properties (H5REPACK-h5repacktest PROPERTIES DEPENDS H5REPACK-testh5repack_detect_szip)
   set (last_test "H5REPACK-h5repacktest")
 
@@ -1203,9 +1118,12 @@ if (BUILD_SHARED_LIBS)
   ADD_H5_UD_TEST (plugin_zero 0 h5repack_layout.h5 -v -f UD=250,0,0)
 endif ()
 
-  if (HDF5_TEST_VFD)
-    # Run test with different Virtual File Driver
-    foreach (vfd ${VFD_LIST})
-      ADD_VFD_TEST (${vfd} 0)
-    endforeach ()
-  endif ()
+##############################################################################
+##############################################################################
+###                         V F D   T E S T S                              ###
+##############################################################################
+##############################################################################
+
+if (HDF5_TEST_VFD)
+  include (CMakeVFDTests.cmake)
+endif ()