HDFFV-10845, 10529 and CMake changes from develop

author: Allen Byrne <byrn@hdfgroup.org> 2019-07-24 16:08:47 (GMT)
committer: Allen Byrne <byrn@hdfgroup.org> 2019-07-24 16:08:47 (GMT)
commit: 34adba4a0c131afe49a75e8e7d92f1e986c1b540 (patch)
tree: 8e196a9fab1502a45d0d05a190fb1f90ec94dbed /tools/test
parent: ab0b1a00aff3bee4a3cf0d31614368935c435b6f (diff)
download: hdf5-34adba4a0c131afe49a75e8e7d92f1e986c1b540.zip
hdf5-34adba4a0c131afe49a75e8e7d92f1e986c1b540.tar.gz
hdf5-34adba4a0c131afe49a75e8e7d92f1e986c1b540.tar.bz2
28 files changed, 691 insertions, 2043 deletions
diff --git a/tools/test/h5copy/CMakeLists.txt b/tools/test/h5copy/CMakeLists.txt
index ecf371f..1130ea7 100644
--- a/tools/test/h5copy/CMakeLists.txt
+++ b/tools/test/h5copy/CMakeLists.txt
@@ -11,7 +11,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   target_link_libraries (h5copygentest PRIVATE ${HDF5_LIB_TARGET})
   set_target_properties (h5copygentest PROPERTIES FOLDER generator/tools)
 
-  #add_test (NAME h5copygentest COMMAND $<TARGET_FILE:h5copygentest>)
+  #add_test (NAME h5copygentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copygentest>)
 endif ()
 
 #-----------------------------------------------------------------------------
diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake
index df56f1a..b0d1615 100644
--- a/tools/test/h5copy/CMakeTests.cmake
+++ b/tools/test/h5copy/CMakeTests.cmake
@@ -65,15 +65,13 @@
       # Remove any output file left over from previous test run
       add_test (
           NAME H5COPY_F-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/${testname}.out.h5
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
       )
     endif ()
 
     add_test (
         NAME H5COPY_F-${testname}
-        COMMAND $<TARGET_FILE:h5copy${tgt_ext}> -f ${fparam} -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN}
+        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_ext}> -f ${fparam} -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN}
     )
     if (HDF5_ENABLE_USING_MEMCHECKER)
       if (last_test)
@@ -87,7 +85,7 @@
     if (NOT ${resultcode} EQUAL 2)
       add_test (
           NAME H5COPY_F-${testname}-DIFF
-          COMMAND $<TARGET_FILE:h5diff${tgt_ext}> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
       set_tests_properties (H5COPY_F-${testname}-DIFF PROPERTIES DEPENDS H5COPY_F-${testname})
       if (${resultcode} EQUAL 1)
@@ -101,15 +99,13 @@
       # Remove any output file left over from previous test run
       add_test (
           NAME H5COPY-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/${testname}.out.h5
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
       )
     endif ()
 
     add_test (
         NAME H5COPY-${testname}
-        COMMAND $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN}
+        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN}
     )
     if (HDF5_ENABLE_USING_MEMCHECKER)
       if (last_test)
@@ -123,7 +119,7 @@
     if (NOT ${resultcode} EQUAL 2)
       add_test (
           NAME H5COPY-${testname}-DIFF
-          COMMAND $<TARGET_FILE:h5diff${tgt_ext}> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
       set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DEPENDS H5COPY-${testname})
       if (${resultcode} EQUAL 1)
@@ -147,15 +143,13 @@
       # Remove any output file left over from previous test run
       add_test (
           NAME H5COPY-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/${testname}.out.h5
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
       )
     endif ()
 
     add_test (
         NAME H5COPY-${testname}-prefill
-        COMMAND $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 -v -s ${psparam} -d ${pdparam}
+        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 -v -s ${psparam} -d ${pdparam}
     )
     if (HDF5_ENABLE_USING_MEMCHECKER)
       if (last_test)
@@ -167,14 +161,14 @@
 
     add_test (
         NAME H5COPY-${testname}
-        COMMAND $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN}
+        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN}
     )
     set_tests_properties (H5COPY-${testname} PROPERTIES DEPENDS H5COPY-${testname}-prefill)
     # resultcode=2 will cause the test to skip the diff test
     if (NOT ${resultcode} EQUAL 2)
       add_test (
           NAME H5COPY-${testname}-DIFF
-          COMMAND $<TARGET_FILE:h5diff${tgt_ext}> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
       set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DEPENDS H5COPY-${testname})
       if (${resultcode} EQUAL 1)
@@ -188,15 +182,13 @@
       # Remove any output file left over from previous test run
       add_test (
           NAME H5COPY_SAME-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/${testname}.out.h5
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
       )
     endif ()
 
     add_test (
         NAME H5COPY_SAME-${testname}-prefill
-        COMMAND $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${pfile} -o ./testfiles/${testname}.out.h5 -v -s ${psparam} -d ${pdparam}
+        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${pfile} -o ./testfiles/${testname}.out.h5 -v -s ${psparam} -d ${pdparam}
     )
     if (HDF5_ENABLE_USING_MEMCHECKER)
       if (last_test)
@@ -208,14 +200,14 @@
 
     add_test (
         NAME H5COPY_SAME-${testname}
-        COMMAND $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${testname}.out.h5 -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN}
+        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${testname}.out.h5 -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN}
     )
     set_tests_properties (H5COPY_SAME-${testname} PROPERTIES DEPENDS H5COPY_SAME-${testname}-prefill)
     # resultcode=2 will cause the test to skip the diff test
     if (NOT ${resultcode} EQUAL 2)
       add_test (
           NAME H5COPY_SAME-${testname}-DIFF
-          COMMAND $<TARGET_FILE:h5diff${tgt_ext}> -v ./testfiles/${testname}.out.h5 ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> -v ./testfiles/${testname}.out.h5 ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
       set_tests_properties (H5COPY_SAME-${testname}-DIFF PROPERTIES DEPENDS H5COPY_SAME-${testname})
       if (${resultcode} EQUAL 1)
@@ -231,7 +223,7 @@
   macro (ADD_H5_CMP_TEST testname resultcode infile vparam sparam srcname dparam dstname)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5COPY-CMP-${testname} COMMAND $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN})
+      add_test (NAME H5COPY-CMP-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN})
       if (${resultcode} EQUAL 1)
         set_tests_properties (H5COPY-CMP-${testname} PROPERTIES WILL_FAIL "true")
       endif ()
@@ -242,15 +234,12 @@
       # Remove any output file left over from previous test run
       add_test (
           NAME H5COPY-CMP-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/${testname}.out.h5
-              ./testfiles/${testname}.out.out
-              ./testfiles/${testname}.out.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}.out.h5
       )
       add_test (
           NAME H5COPY-CMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5copy${tgt_ext}>"
               -D "TEST_ARGS=-i;./testfiles/${infile};-o;./testfiles/${testname}.out.h5;${vparam};${sparam};${srcname};${dparam};${dstname}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -270,18 +259,13 @@
       # Remove any output file left over from previous test run
       add_test (
           NAME H5COPY_UD-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/${testname}.out.h5
-              testfiles/${infile}.out
-              testfiles/${infile}.out.err
-              testfiles/${testname}.out.h5.out
-              testfiles/${testname}.out.h5.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}.out.h5
       )
       if (${resultcode} EQUAL 2)
         add_test (
             NAME H5COPY_UD-${testname}
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5copy-shared>"
                 -D "TEST_ARGS:STRING=-v;-i;./testfiles/${infile};-o;./testfiles/${testname}.out.h5;${sparam};${srcname};${dparam};${dstname}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -298,6 +282,7 @@
         add_test (
             NAME H5COPY_UD-${testname}
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5copy-shared>"
                 -D "TEST_ARGS:STRING=-v;-i;./testfiles/${infile};-o;./testfiles/${testname}.out.h5;${sparam};${srcname};${dparam};${dstname}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -315,6 +300,7 @@
       add_test (
           NAME H5COPY_UD-${testname}-DIFF
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
               -D "TEST_ARGS:STRING=-v;./testfiles/${cmpfile};./testfiles/${testname}.out.h5;${srcname};${dstname}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -336,18 +322,13 @@
       # Remove any output file left over from previous test run
       add_test (
           NAME H5COPY_UD_ERR-${testname}-clearall-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/${testname}_ERR.out.h5
-              testfiles/${infile}_ERR.out
-              testfiles/${infile}_ERR.out.err
-              testfiles/${testname}_ERR.out.h5.out
-              testfiles/${testname}_ERR.out.h5.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}_ERR.out.h5
       )
       if (${resultcode} EQUAL 2)
         add_test (
             NAME H5COPY_UD_ERR-${testname}
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5copy-shared>"
                 -D "TEST_ARGS:STRING=-v;--enable-error-stack;-i;./testfiles/${infile};-o;./testfiles/${testname}_ERR.out.h5;${sparam};${srcname};${dparam};${dstname}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -365,6 +346,7 @@
         add_test (
             NAME H5COPY_UD_ERR-${testname}
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5copy-shared>"
                 -D "TEST_ARGS:STRING=-v;--enable-error-stack;-i;./testfiles/${infile};-o;./testfiles/${testname}_ERR.out.h5;${sparam};${srcname};${dparam};${dstname}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -383,6 +365,7 @@
       add_test (
           NAME H5COPY_UD_ERR-${testname}-DIFF
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
               -D "TEST_ARGS:STRING=-v;./testfiles/${cmpfile};./testfiles/${testname}_ERR.out.h5;${srcname};${dstname}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -417,8 +400,7 @@
     # Remove any output file left over from previous test run
     add_test (
         NAME H5COPY-clearall-objects
-        COMMAND    ${CMAKE_COMMAND}
-            -E remove
+        COMMAND ${CMAKE_COMMAND} -E remove
             simple.out.h5
             chunk.out.h5
             compact.out.h5
@@ -451,8 +433,6 @@
             samefile1.out.h5
             samefile2.out.h5
             h5copy_misc1.out.h5
-            h5copy_misc1.out.out
-            h5copy_misc1.out.out.err
     )
     set_tests_properties (H5COPY-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
     if (last_test)
diff --git a/tools/test/h5diff/CMakeLists.txt b/tools/test/h5diff/CMakeLists.txt
index 0a874ec..cb4397f 100644
--- a/tools/test/h5diff/CMakeLists.txt
+++ b/tools/test/h5diff/CMakeLists.txt
@@ -11,7 +11,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   target_link_libraries (h5diffgentest PRIVATE ${HDF5_LIB_TARGET})
   set_target_properties (h5diffgentest PROPERTIES FOLDER generator/tools)
 
-  #add_test (NAME h5diffgentest COMMAND $<TARGET_FILE:h5diffgentest>)
+  #add_test (NAME h5diffgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diffgentest>)
 endif ()
 
 #-----------------------------------------------------------------------------
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 604c8a5..93dfd72 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -324,7 +324,14 @@
   #
   # Overwrite system dependent files (Windows) and not VS2015
   #
+  set (COPY_WINDOWS_FILES false)
+  if (MINGW)
+    set (COPY_WINDOWS_FILES true)
+  endif ()
   if (WIN32 AND MSVC_VERSION LESS 1900)
+    set (COPY_WINDOWS_FILES true)
+  endif ()
+  if (COPY_WINDOWS_FILES)
     foreach (h5_tstfiles ${LIST_WIN_TEST_FILES})
       get_filename_component(fname "${h5_tstfiles}" NAME)
       HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/testfiles/${fname}.txt" "h5diff_files")
@@ -358,7 +365,7 @@
   macro (ADD_H5_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DIFF-${resultfile} COMMAND $<TARGET_FILE:h5diff${tgt_ext}> ${ARGN})
+      add_test (NAME H5DIFF-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> ${ARGN})
       set_tests_properties (H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
       if (${resultcode})
         set_tests_properties (H5DIFF-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -367,20 +374,10 @@
         set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
       endif ()
     else ()
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DIFF-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/${resultfile}.out
-              testfiles/${resultfile}.out.err
-      )
-      if (last_test)
-        set_tests_properties (H5DIFF-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
       add_test (
           NAME H5DIFF-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -390,7 +387,9 @@
               -D "TEST_APPEND=EXIT CODE:"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS H5DIFF-${resultfile}-clear-objects)
+      if (last_test)
+        set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
+      endif ()
     endif ()
     if (H5_HAVE_PARALLEL)
       ADD_PH5_TEST (${resultfile} ${resultcode} ${ARGN})
@@ -409,17 +408,6 @@
         set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
       endif ()
     else ()
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME MPI_TEST_H5DIFF-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              PAR/testfiles/${resultfile}.out
-              PAR/testfiles/${resultfile}.out.err
-      )
-      if (last_test)
-        set_tests_properties (MPI_TEST_H5DIFF-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
       add_test (
           NAME MPI_TEST_H5DIFF-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -435,25 +423,20 @@
               -D "TEST_SORT_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DEPENDS MPI_TEST_H5DIFF-${resultfile}-clear-objects)
+      if (last_test)
+        set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
+      endif ()
       set (last_test "PH5DIFF-${resultfile}")
     endif ()
   endmacro ()
 
   macro (ADD_H5_UD_TEST testname resultcode resultfile)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DIFF_UD-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/${resultfile}.out
-              testfiles/${resultfile}.out.err
-      )
       if (${resultcode} EQUAL 2)
         add_test (
             NAME H5DIFF_UD-${testname}
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
                 -D "TEST_ARGS:STRING=${ARGN}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -470,6 +453,7 @@
         add_test (
             NAME H5DIFF_UD-${testname}
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
                 -D "TEST_ARGS:STRING=${ARGN}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -483,7 +467,9 @@
                 -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
         )
       endif ()
-      set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DEPENDS H5DIFF_UD-${testname}-clear-objects)
+      if (last_test)
+        set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
     endif ()
   endmacro ()
 
diff --git a/tools/test/h5dump/CMakeLists.txt b/tools/test/h5dump/CMakeLists.txt
index 1672774..38f4118 100644
--- a/tools/test/h5dump/CMakeLists.txt
+++ b/tools/test/h5dump/CMakeLists.txt
@@ -40,7 +40,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   target_link_libraries (h5dumpgentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
   set_target_properties (h5dumpgentest PROPERTIES FOLDER generator/tools)
 
-  #add_test (NAME h5dumpgentest COMMAND $<TARGET_FILE:h5dumpgentest>)
+  #add_test (NAME h5dumpgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dumpgentest>)
 endif ()
 
 include (CMakeTests.cmake)
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 7f52796..111c120 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -360,12 +360,7 @@
   endforeach ()
 
   foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES})
-    if (WIN32)
-      file (READ ${HDF5_TOOLS_DIR}/testfiles/${tst_exp_file} TEST_STREAM)
-      file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file} "${TEST_STREAM}")
-    else ()
-      HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files")
-    endif ()
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files")
   endforeach ()
 
   foreach (tst_other_file ${HDF5_REFERENCE_FILES})
@@ -386,9 +381,10 @@
   # --------------------------------------------------------------------
   HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files")
 
-  if (WIN32)
-    file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM)
-    file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}")
+  if (WIN32 OR MINGW)
+    configure_file(${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF)
+    #file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM)
+    #file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}")
   else ()
     HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp" "${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp" "h5dump_std_files")
   endif ()
@@ -409,27 +405,17 @@
   macro (ADD_HELP_TEST testname resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-${testname} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
+      add_test (NAME H5DUMP-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
       set_tests_properties (H5DUMP-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       if (last_test)
         set_tests_properties (H5DUMP-${testname} PROPERTIES DEPENDS ${last_test})
       endif ()
       set (last_test "H5DUMP-${testname}")
     else ()
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/std/h5dump-${testname}.out
-              testfiles/std/h5dump-${testname}.out.err
-      )
-      if (last_test)
-        set_tests_properties (H5DUMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
       add_test (
           NAME H5DUMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -438,7 +424,9 @@
               -D "TEST_REFERENCE=h5dump-${testname}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-${testname} PROPERTIES DEPENDS H5DUMP-${testname}-clear-objects)
+      if (last_test)
+        set_tests_properties (H5DUMP-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
     endif ()
   endmacro ()
 
@@ -459,7 +447,7 @@
   macro (ADD_H5_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
+      add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       if (${resultcode})
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -470,16 +458,13 @@
     else ()
       add_test (
           NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.bin
-              ${resultfile}.out
-              ${resultfile}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.bin
       )
       set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -495,7 +480,7 @@
   macro (ADD_H5_TEST_N resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-N-${resultfile} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
+      add_test (NAME H5DUMP-N-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
       set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       if (${resultcode})
         set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -506,16 +491,13 @@
     else ()
       add_test (
           NAME H5DUMP-N-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}-N.bin
-              ${resultfile}-N.out
-              ${resultfile}-N.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}-N.bin
       )
       set_tests_properties (H5DUMP-N-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-N-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -531,7 +513,7 @@
   macro (ADD_H5_TEST_EXPORT resultfile targetfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN} ${resultfile}.txt ${targetfile})
+      add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN} ${resultfile}.txt ${targetfile})
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       if (${resultcode})
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -542,16 +524,13 @@
     else ()
       add_test (
           NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.txt
-              ${resultfile}.out
-              ${resultfile}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.txt
       )
       set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN};${resultfile}.txt;${targetfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -561,20 +540,21 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
-      add_test (
-          NAME H5DUMP-${resultfile}-output-cmp
-          COMMAND ${CMAKE_COMMAND}
-                -E compare_files ${resultfile}.txt ${resultfile}.exp
-      )
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile})
+      if(NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+        add_test (
+            NAME H5DUMP-${resultfile}-output-cmp
+            COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+        )
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile})
+      endif ()
     endif ()
   endmacro ()
 
   macro (ADD_H5_TEST_EXPORT_DDL resultfile targetfile resultcode ddlfile)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> --ddl=${ddlfile}.txt ${ARGN} ${resultfile}.txt ${targetfile})
+      add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> --ddl=${ddlfile}.txt ${ARGN} ${resultfile}.txt ${targetfile})
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       if (${resultcode})
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -585,17 +565,15 @@
     else ()
       add_test (
           NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
+          COMMAND ${CMAKE_COMMAND} -E remove
               ${ddlfile}.txt
               ${resultfile}.txt
-              ${resultfile}.out
-              ${resultfile}.out.err
       )
       set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=--ddl=${ddlfile}.txt;${ARGN};${resultfile}.txt;${targetfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -605,20 +583,20 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
-      add_test (
-          NAME H5DUMP-${resultfile}-output-cmp
-          COMMAND ${CMAKE_COMMAND}
-                -E compare_files ${resultfile}.txt ${resultfile}.exp
-      )
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile})
-      add_test (
-          NAME H5DUMP-${resultfile}-output-cmp-ddl
-          COMMAND ${CMAKE_COMMAND}
-                -E compare_files ${ddlfile}.txt ${ddlfile}.exp
-      )
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES DEPENDS H5DUMP-${resultfile}-output-cmp)
+      if(NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+        add_test (
+            NAME H5DUMP-${resultfile}-output-cmp
+            COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+        )
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile})
+        add_test (
+            NAME H5DUMP-${resultfile}-output-cmp-ddl
+            COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${ddlfile}.txt ${ddlfile}.exp
+        )
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES DEPENDS H5DUMP-${resultfile}-output-cmp)
+      endif ()
     endif ()
   endmacro ()
 
@@ -626,40 +604,32 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5DUMP-output-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}.txt
+          COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.txt
       )
       set_tests_properties (H5DUMP-output-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-output-${resultfile}
-          COMMAND $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN} ${resultfile}.txt ${targetfile}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN} ${resultfile}.txt ${targetfile}
       )
       set_tests_properties (H5DUMP-output-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       set_tests_properties (H5DUMP-output-${resultfile} PROPERTIES DEPENDS H5DUMP-output-${resultfile}-clear-objects)
-      add_test (
-          NAME H5DUMP-output-cmp-${resultfile}
-          COMMAND ${CMAKE_COMMAND}
-                -E compare_files ${resultfile}.txt ${resultfile}.exp
-      )
-      set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES DEPENDS H5DUMP-output-${resultfile})
+      if(NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+        add_test (
+            NAME H5DUMP-output-cmp-${resultfile}
+            COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+        )
+        set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+        set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES DEPENDS H5DUMP-output-${resultfile})
+      endif ()
     endif ()
   endmacro ()
 
   macro (ADD_H5_MASK_TEST resultfile resultcode)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -669,24 +639,15 @@
               -D "TEST_MASK_ERROR=true"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
   endmacro ()
 
   macro (ADD_H5_GREP_TEST resultfile resultcode result_check)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -695,24 +656,15 @@
               -D "TEST_REFERENCE=${result_check}"
               -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
       )
-    set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
   endmacro ()
 
   macro (ADD_H5ERR_MASK_TEST resultfile resultcode result_errcheck)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -722,24 +674,15 @@
               -D "TEST_ERRREF=${result_errcheck}"
               -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
       )
-    set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
   endmacro ()
 
   macro (ADD_H5ERR_MASK_ENV_TEST resultfile resultcode result_errcheck envvar envval)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -751,7 +694,6 @@
               -D "TEST_ENV_VALUE:STRING=${envval}"
               -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
       )
-      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
   endmacro ()
 
@@ -760,16 +702,15 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5DUMP-IMPORT-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
+          COMMAND ${CMAKE_COMMAND} -E remove
               ${resultfile}.bin
               ${resultfile}.h5
-              ${conffile}.out
       )
       set_tests_properties (H5DUMP-IMPORT-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-IMPORT-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN};-o;${resultfile}.bin;${testfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -779,10 +720,10 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
       set_tests_properties (H5DUMP-IMPORT-${resultfile} PROPERTIES DEPENDS "H5DUMP-IMPORT-${resultfile}-clear-objects")
-      add_test (NAME H5DUMP-IMPORT-h5import-${resultfile} COMMAND $<TARGET_FILE:h5import> ${resultfile}.bin -c ${conffile}.out -o ${resultfile}.h5)
+      add_test (NAME H5DUMP-IMPORT-h5import-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5import> ${resultfile}.bin -c ${conffile}.out -o ${resultfile}.h5)
       set_tests_properties (H5DUMP-IMPORT-h5import-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       set_tests_properties (H5DUMP-IMPORT-h5import-${resultfile} PROPERTIES DEPENDS H5DUMP-IMPORT-${resultfile})
-      add_test (NAME H5DUMP-IMPORT-h5diff-${resultfile} COMMAND $<TARGET_FILE:h5diff> ${testfile} ${resultfile}.h5 /integer /integer)
+      add_test (NAME H5DUMP-IMPORT-h5diff-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff> ${testfile} ${resultfile}.h5 /integer /integer)
       set_tests_properties (H5DUMP-IMPORT-h5diff-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       set_tests_properties (H5DUMP-IMPORT-h5diff-${resultfile} PROPERTIES DEPENDS H5DUMP-IMPORT-h5import-${resultfile})
     endif ()
@@ -790,18 +731,10 @@
 
   macro (ADD_H5_UD_TEST testname resultcode resultfile)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP_UD-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP_UD-${testname}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP_UD-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
@@ -813,7 +746,6 @@
               -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP_UD-${testname} PROPERTIES DEPENDS H5DUMP_UD-${testname}-clear-objects)
     endif ()
   endmacro ()
 
@@ -823,368 +755,6 @@
 ##############################################################################
 ##############################################################################
 
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    # Remove any output file left over from previous test run
-    add_test (
-      NAME H5DUMP-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          h5dump-help.out
-          charsets.out
-          charsets.out.err
-          file_space.out
-          file_space.out.err
-          filter_fail.out
-          filter_fail.out.err
-          non_existing.out
-          non_existing.out.err
-          packedbits.out
-          packedbits.out.err
-          tall-1.out
-          tall-1.out.err
-          tall-2.out
-          tall-2.out.err
-          tall-2A.out
-          tall-2A.out.err
-          tall-2A0.out
-          tall-2A0.out.err
-          tall-2B.out
-          tall-2B.out.err
-          tall-3.out
-          tall-3.out.err
-          tall-4s.out
-          tall-4s.out.err
-          tall-5s.out
-          tall-5s.out.err
-          tall-6.txt
-          tall-6.out
-          tall-6.out.err
-          tall-7.out
-          tall-7.out.err
-          tall-7N.out
-          tall-7N.out.err
-          tallfilters.out
-          tallfilters.out.err
-          tarray1.out
-          tarray1.out.err
-          tarray1_big.out
-          tarray1_big.out.err
-          tarray2.out
-          tarray2.out.err
-          tarray3.out
-          tarray3.out.err
-          tarray4.out
-          tarray4.out.err
-          tarray5.out
-          tarray5.out.err
-          tarray6.out
-          tarray6.out.err
-          tarray7.out
-          tarray7.out.err
-          tarray8.out
-          tarray8.out.err
-          tattr-1.out
-          tattr-1.out.err
-          tattr-2.out
-          tattr-2.out.err
-          tattr-3.out
-          tattr-3.out.err
-          tattr-4_be.out
-          tattr-4_be.out.err
-          tattrcontents1.out
-          tattrcontents1.out.err
-          tattrcontents2.out
-          tattrcontents2.out.err
-          tattrintsize.out
-          tattrintsize.out.err
-          tattrreg.out
-          tattrreg.out.err
-          tattrregR.out
-          tattrregR.out.err
-          tbin1LE.bin
-          tbinregR.txt
-          tbinregR.out
-          tbinregR.out.err
-          tbigdims.out
-          tbigdims.out.err
-          tbitnopaque_be.out
-          tbitnopaque_be.out.err
-          tbitnopaque_le.out
-          tbitnopaque_le.out.err
-          tboot1.out
-          tboot1.out.err
-          tboot2.out
-          tboot2.out.err
-          tboot2A.out
-          tboot2A.out.err
-          tboot2B.out
-          tboot2B.out.err
-          tchar1.out
-          tchar1.out.err
-          tchunked.out
-          tchunked.out.err
-          tcmpdattrintsize.out
-          tcmpdattrintsize.out.err
-          tcmpdintarray.out
-          tcmpdintarray.out.err
-          tcmpdints.out
-          tcmpdints.out.err
-          tcmpdintsize.out
-          tcmpdintsize.out.err
-          tcomp-1.out
-          tcomp-1.out.err
-          tcomp-2.out
-          tcomp-2.out.err
-          tcomp-3.out
-          tcomp-3.out.err
-          tcomp-4.out
-          tcomp-4.out.err
-          tcompact.out
-          tcompact.out.err
-          tcompound_complex.out
-          tcompound_complex.out.err
-          tcontents.out
-          tcontents.out.err
-          tcontiguos.out
-          tcontiguos.out.err
-          tdatareg.out
-          tdatareg.out.err
-          tdataregR.out
-          tdataregR.out.err
-          tdeflate.out
-          tdeflate.out.err
-          tdset-1.out
-          tdset-1.out.err
-          tdset-2.out
-          tdset-2.out.err
-          tdset-3s.out
-          tdset-3s.out.err
-          tempty.out
-          tempty.out.err
-          texternal.out
-          texternal.out.err
-          textlinksrc.out
-          textlinksrc.out.err
-          textlinkfar.out
-          textlinkfar.out.err
-          textlink.out
-          textlink.out.err
-          tfamily.out
-          tfamily.out.err
-          tfill.out
-          tfill.out.err
-          tfletcher32.out
-          tfletcher32.out.err
-          tfpformat.out
-          tfpformat.out.err
-          tgroup-1.out
-          tgroup-1.out.err
-          tgroup-2.out
-          tgroup-2.out.err
-          tgrp_comments.out
-          tgrp_comments.out.err
-          tgrpnullspace.out
-          tgrpnullspace.out.err
-          thlink-1.out
-          thlink-1.out.err
-          thlink-2.out
-          thlink-2.out.err
-          thlink-3.out
-          thlink-3.out.err
-          thlink-4.out
-          thlink-4.out.err
-          thlink-5.out
-          thlink-5.out.err
-          thyperslab.out
-          thyperslab.out.err
-          tindicesno.out
-          tindicesno.out.err
-          tindicessub1.out
-          tindicessub1.out.err
-          tindicessub2.out
-          tindicessub2.out.err
-          tindicessub3.out
-          tindicessub3.out.err
-          tindicessub4.out
-          tindicessub4.out.err
-          texceedsubstart.out
-          texceedsubstart.out.err
-          texceedsubcount.out
-          texceedsubcount.out.err
-          texceedsubstride.out
-          texceedsubstride.out.err
-          texceedsubblock.out
-          texceedsubblock.out.err
-          tindicesyes.out
-          tindicesyes.out.err
-          tints4dims.out
-          tints4dims.out.err
-          tints4dimsBlock2.out
-          tints4dimsBlock2.out.err
-          tints4dimsBlockEq.out
-          tints4dimsBlockEq.out.err
-          tints4dimsCount2.out
-          tints4dimsCount2.out.err
-          tints4dimsCountEq.out
-          tints4dimsCountEq.out.err
-          tints4dimsStride2.out
-          tints4dimsStride2.out.err
-          tintsattrs.out
-          tintsattrs.out.err
-          tintsnodata.out
-          tintsnodata.out.err
-          tlarge_objname.out
-          tlarge_objname.out.err
-          tldouble.out
-          tldouble.out.err
-          tlonglinks.out
-          tlonglinks.out.err
-          tloop-1.out
-          tloop-1.out.err
-          tmulti.out
-          tmulti.out.err
-          tmultifile.out
-          tmultifile.out.err
-#          tqmarkfile.out
-#          tqmarkfile.out.err
-#          tstarfile.out
-#          tstarfile.out.err
-          tnamed_dtype_attr.out
-          tnamed_dtype_attr.out.err
-          tnbit.out
-          tnbit.out.err
-          tnestcomp-1.out
-          tnestcomp-1.out.err
-          tnestedcmpddt.out
-          tnestedcmpddt.out.err
-          tnoattrdata.out
-          tnoattrdata.out.err
-          tnoattrddl.out
-          tnoattrddl.out.err
-          tnodata.out
-          tnodata.out.err
-          tnoddl.out
-          tnoddl.out.err
-          tnoddlfile.out
-          tnoddlfile.out.err
-          tno-subset.out
-          tno-subset.out.err
-          tnullspace.out
-          tnullspace.out.err
-          tordergr1.out
-          tordergr1.out.err
-          tordergr2.out
-          tordergr2.out.err
-          tordergr3.out
-          tordergr3.out.err
-          tordergr4.out
-          tordergr4.out.err
-          tordergr5.out
-          tordergr5.out.err
-          torderattr1.out
-          torderattr1.out.err
-          torderattr2.out
-          torderattr2.out.err
-          torderattr3.out
-          torderattr3.out.err
-          torderattr4.out
-          torderattr4.out.err
-          tordercontents1.out
-          tordercontents1.out.err
-          tordercontents2.out
-          tordercontents2.out.err
-          torderlinks1.out
-          torderlinks1.out.err
-          torderlinks2.out
-          torderlinks2.out.err
-          tperror.out
-          tperror.out.err
-          trawdatafile.out
-          trawdatafile.out.err
-          trawdatafile.txt
-          trawssetfile.out
-          trawssetfile.out.err
-          trawssetfile.txt
-          treadfilter.out
-          treadfilter.out.err
-          treadintfilter.out
-          treadintfilter.out.err
-          treference.out
-          treference.out.err
-          tsaf.out
-          tsaf.out.err
-          tscalarattrintsize.out
-          tscalarattrintsize.out.err
-          tscalarintattrsize.out
-          tscalarintattrsize.out.err
-          tscalarintsize.out
-          tscalarintsize.out.err
-          tscalarstring.out
-          tscalarstring.out.err
-          tscaleoffset.out
-          tscaleoffset.out.err
-          tshuffle.out
-          tshuffle.out.err
-          tslink-1.out
-          tslink-1.out.err
-          tslink-2.out
-          tslink-2.out.err
-          tslink-D.out
-          tslink-D.out.err
-          tsplit_file.out
-          tsplit_file.out.err
-          tstr-1.out
-          tstr-1.out.err
-          tstr-2.out
-          tstr-2.out.err
-          tstr2bin2.txt
-          tstr2bin6.txt
-          tstring.out
-          tstring.out.err
-          tstring2.out
-          tstring2.out.err
-          tstringe.out
-          tstringe.out.err
-          tszip.out
-          tszip.out.err
-          tudlink-1.out
-          tudlink-1.out.err
-          tudlink-2.out
-          tudlink-2.out.err
-          tuserfilter.out
-          tuserfilter.out.err
-          tvldtypes1.out
-          tvldtypes1.out.err
-          tvldtypes2.out
-          tvldtypes2.out.err
-          tvldtypes3.out
-          tvldtypes3.out.err
-          tvldtypes4.out
-          tvldtypes4.out.err
-          tvldtypes5.out
-          tvldtypes5.out.err
-          tvlenstr_array.out
-          tvlenstr_array.out.err
-          tvlstr.out
-          tvlstr.out.err
-          tvms.out
-          tvms.out.err
-          twidedisplay.out
-          twidedisplay.out.err
-          twithddl.txt
-          twithddlfile.out
-          twithddlfile.out.err
-          twithddlfile.txt
-          zerodim.out
-          zerodim.out.err
-    )
-    set_tests_properties (H5DUMP-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-    if (last_test)
-      set_tests_properties (H5DUMP-clearall-objects PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "H5DUMP-clearall-objects")
-  endif ()
-
   ADD_HELP_TEST(help 0 -h)
 
   # test data output redirection
diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake
index feb5c68..a6be9ae 100644
--- a/tools/test/h5dump/CMakeTestsPBITS.cmake
+++ b/tools/test/h5dump/CMakeTestsPBITS.cmake
@@ -128,7 +128,7 @@
   macro (ADD_H5_PBITS_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
+      add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits")
       if (${resultcode})
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -137,18 +137,10 @@
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_pbits_test})
       endif ()
     else ()
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/pbits"
@@ -157,7 +149,6 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS H5DUMP-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
@@ -167,126 +158,6 @@
 ##############################################################################
 ##############################################################################
 
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    # Remove any output file left over from previous test run
-    add_test (
-      NAME H5DUMP_PACKED_BITS-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          tnofilename-with-packed-bits.out
-          tnofilename-with-packed-bits.out.err
-          tpbitsArray.out
-          tpbitsArray.out.err
-          tpbitsCompound.out
-          tpbitsCompound.out.err
-          tpbitsIncomplete.out
-          tpbitsIncomplete.out.err
-          tpbitsLengthExceeded.out
-          tpbitsLengthExceeded.out.err
-          tpbitsCharLengthExceeded.out
-          tpbitsCharLengthExceeded.out.err
-          tpbitsIntLengthExceeded.out
-          tpbitsIntLengthExceeded.out.err
-          tpbitsLongLengthExceeded.out
-          tpbitsLongLengthExceeded.out.err
-          tpbitsLengthPositive.out
-          tpbitsLengthPositive.out.err
-          tpbitsMax.out
-          tpbitsMax.out.err
-          tpbitsMaxExceeded.out
-          tpbitsMaxExceeded.out.err
-          tpbitsOffsetExceeded.out
-          tpbitsOffsetExceeded.out.err
-          tpbitsCharOffsetExceeded.out
-          tpbitsCharOffsetExceeded.out.err
-          tpbitsIntOffsetExceeded.out
-          tpbitsIntOffsetExceeded.out.err
-          tpbitsLongOffsetExceeded.out
-          tpbitsLongOffsetExceeded.out.err
-          tpbitsOffsetNegative.out
-          tpbitsOffsetNegative.out.err
-          tpbitsOverlapped.out
-          tpbitsOverlapped.out.err
-          tpbitsSigned.out
-          tpbitsSigned.out.err
-          tpbitsUnsigned.out
-          tpbitsUnsigned.out.err
-          tpbitsSignedInt.out
-          tpbitsSignedInt.out.err
-          tpbitsUnsignedInt.out
-          tpbitsUnsignedInt.out.err
-          tpbitsSignedLong.out
-          tpbitsSignedLong.out.err
-          tpbitsUnsignedLong.out
-          tpbitsUnsignedLong.out.err
-          tpbitsSignedLongLong.out
-          tpbitsSignedLongLong.out.err
-          tpbitsUnsignedLongLong.out
-          tpbitsUnsignedLongLong.out.err
-          tpbitsSignedWhole.out
-          tpbitsSignedWhole.out.err
-          tpbitsUnsignedWhole.out
-          tpbitsUnsignedWhole.out.err
-          tpbitsSignedIntWhole.out
-          tpbitsSignedIntWhole.out.err
-          tpbitsUnsignedIntWhole.out
-          tpbitsUnsignedIntWhole.out.err
-          tpbitsSignedLongWhole.out
-          tpbitsSignedLongWhole.out.err
-          tpbitsUnsignedLongWhole.out
-          tpbitsUnsignedLongWhole.out.err
-          tpbitsSignedLongLongWhole.out
-          tpbitsSignedLongLongWhole.out.err
-          tpbitsUnsignedLongLongWhole.out
-          tpbitsUnsignedLongLongWhole.out.err
-          tpbitsSignedLongLongWhole1.out
-          tpbitsSignedLongLongWhole1.out.err
-          tpbitsUnsignedLongLongWhole1.out
-          tpbitsUnsignedLongLongWhole1.out.err
-          tpbitsSignedLongLongWhole63.out
-          tpbitsSignedLongLongWhole63.out.err
-          tpbitsUnsignedLongLongWhole63.out
-          tpbitsUnsignedLongLongWhole63.out.err
-          tpbitsSigned4.out
-          tpbitsSigned4.out.err
-          tpbitsUnsigned4.out
-          tpbitsUnsigned4.out.err
-          tpbitsSignedInt8.out
-          tpbitsSignedInt8.out.err
-          tpbitsUnsignedInt8.out
-          tpbitsUnsignedInt8.out.err
-          tpbitsSignedLong16.out
-          tpbitsSignedLong16.out.err
-          tpbitsUnsignedLong16.out
-          tpbitsUnsignedLong16.out.err
-          tpbitsSignedLongLong32.out
-          tpbitsSignedLongLong32.out.err
-          tpbitsUnsignedLongLong32.out
-          tpbitsUnsignedLongLong32.out.err
-          tpbitsSigned2.out
-          tpbitsSigned2.out.err
-          tpbitsUnsigned2.out
-          tpbitsUnsigned2.out.err
-          tpbitsSignedInt4.out
-          tpbitsSignedInt4.out.err
-          tpbitsUnsignedInt4.out
-          tpbitsUnsignedInt4.out.err
-          tpbitsSignedLong8.out
-          tpbitsSignedLong8.out.err
-          tpbitsUnsignedLong8.out
-          tpbitsUnsignedLong8.out.err
-          tpbitsSignedLongLong16.out
-          tpbitsSignedLongLong16.out.err
-          tpbitsUnsignedLongLong16.out
-          tpbitsUnsignedLongLong16.out.err
-    )
-    set_tests_properties (H5DUMP_PACKED_BITS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits")
-    if (last_pbits_test)
-      set_tests_properties (H5DUMP_PACKED_BITS-clearall-objects PROPERTIES DEPENDS ${last_pbits_test})
-    endif ()
-    set (last_pbits_test "H5DUMP_PACKED_BITS-clearall-objects")
-  endif ()
-
   # test failure handling
   # Missing file name
   ADD_H5_PBITS_TEST (tnofilename-with-packed-bits 1 --enable-error-stack)
diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake
index c557ba4..036609c 100644
--- a/tools/test/h5dump/CMakeTestsVDS.cmake
+++ b/tools/test/h5dump/CMakeTestsVDS.cmake
@@ -124,7 +124,7 @@
   macro (ADD_H5_VDS_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
+      add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
       if (${resultcode})
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -133,18 +133,10 @@
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_VDS_test})
       endif ()
     else ()
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/vds"
@@ -153,14 +145,13 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS H5DUMP-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
   macro (ADD_H5_VDS_PREFIX_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP_PREFIX-${resultfile} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
+      add_test (NAME H5DUMP_PREFIX-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN})
       set_tests_properties (H5DUMP_PREFIX-${resultfile} PROPERTIES
           ENVIRONMENT "HDF5_VDS_PREFIX=${PROJECT_BINARY_DIR}/testfiles/vds/"
           WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds/prefix"
@@ -172,18 +163,10 @@
         set_tests_properties (H5DUMP_PREFIX-${resultfile} PROPERTIES DEPENDS ${last_VDS_test})
       endif ()
     else ()
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP_PREFIX-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP_PREFIX-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds/prefix")
       add_test (
           NAME H5DUMP_PREFIX-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/vds/prefix"
@@ -194,14 +177,13 @@
               -D "TEST_ENV_VALUE=${PROJECT_BINARY_DIR}/testfiles/vds/"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP_PREFIX-${resultfile} PROPERTIES DEPENDS H5DUMP_PREFIX-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
   macro (ADD_H5_VDS_LAYOUT resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> -p ${ARGN})
+      add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> -p ${ARGN})
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
       if (${resultcode})
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -210,18 +192,10 @@
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_VDS_test})
       endif ()
     else ()
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=-p;${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/vds"
@@ -230,7 +204,6 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
   endmacro ()
 
@@ -240,54 +213,6 @@
 ##############################################################################
 ##############################################################################
 
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    # Remove any output file left over from previous test run
-    add_test (
-      NAME H5DUMP_VDS-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          tvds-1.out
-          tvds-1.out.err
-          tvds-2.out
-          tvds-2.out.err
-          tvds-3_1.out
-          tvds-3_1.out.err
-          tvds-3_2.out
-          tvds-3_2.out.err
-          tvds-4.out
-          tvds-4.out.err
-          tvds-5.out
-          tvds-5.out.err
-          vds-first.out
-          vds-first.out.err
-          vds-gap1.out
-          vds-gap1.out.err
-          vds-gap2.out
-          vds-gap2.out.err
-          tvds_layout-1.out
-          tvds_layout-1.out.err
-          tvds_layout-2.out
-          tvds_layout-2.out.err
-          tvds_layout-3_1.out
-          tvds_layout-3_1.out.err
-          tvds_layout-3_2.out
-          tvds_layout-3_2.out.err
-          tvds_layout-4.out
-          tvds_layout-4.out.err
-          tvds_layout-5.out
-          tvds_layout-5.out.err
-          vds_layout-eiger.out
-          vds_layout-eiger.out.err
-          vds_layout-maxmin.out
-          vds_layout-maxmin.out.err
-    )
-    set_tests_properties (H5DUMP_VDS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
-    if (last_vds_test)
-      set_tests_properties (H5DUMP_VDS-clearall-objects PROPERTIES DEPENDS ${last_vds_test})
-    endif ()
-    set (last_VDS_test "H5DUMP_VDS-clearall-objects")
-  endif ()
-
 # See which filters are usable (and skip tests for filters we
 # don't have).  Do this by searching H5pubconf.h to see which
 # filters are defined.
diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake
index a883b86..6d73cb1 100644
--- a/tools/test/h5dump/CMakeTestsXML.cmake
+++ b/tools/test/h5dump/CMakeTestsXML.cmake
@@ -182,7 +182,7 @@
 
   macro (ADD_XML_H5_TEST resultfile resultcode)
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP_XML-${resultfile} COMMAND $<TARGET_FILE:h5dump${tgt_ext}> --xml ${ARGN})
+      add_test (NAME H5DUMP_XML-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> --xml ${ARGN})
       set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml")
       if (${resultcode})
         set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -191,18 +191,10 @@
         set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES DEPENDS ${last_xml_test})
       endif ()
     else ()
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5DUMP_XML-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5DUMP_XML-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml")
       add_test (
           NAME H5DUMP_XML-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=--xml;${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/xml"
@@ -211,7 +203,6 @@
               -D "TEST_REFERENCE=${resultfile}.xml"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES DEPENDS H5DUMP_XML-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
@@ -221,154 +212,6 @@
 ##############################################################################
 ##############################################################################
 
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    # Remove any output file left over from previous test run
-    add_test (
-      NAME H5DUMP-XML-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          tall.h5.out
-          tall.h5.out.err
-          tall-2A.h5.out
-          tall-2A.h5.out.err
-          tarray1.h5.out
-          tarray1.h5.out.err
-          tarray2.h5.out
-          tarray2.h5.out.err
-          tarray3.h5.out
-          tarray3.h5.out.err
-          tarray6.h5.out
-          tarray6.h5.out.err
-          tarray7.h5.out
-          tarray7.h5.out.err
-          tattr.h5.out
-          tattr.h5.out.err
-          tbitfields_be.h5.out
-          tbitfields_be.h5.out.err
-          tbitfields_le.h5.out
-          tbitfields_le.h5.out.err
-          tcompound.h5.out
-          tcompound.h5.out.err
-          tcompound2.h5.out
-          tcompound2.h5.out.err
-          tcompound_complex.h5.out
-          tcompound_complex.h5.out.err
-          tdatareg.h5.out
-          tdatareg.h5.out.err
-          tdset.h5.out
-          tdset.h5.out.err
-          tdset2.h5.out
-          tdset2.h5.out.err
-          tempty-dtd-2.h5.out
-          tempty-dtd-2.h5.out.err
-          tempty-dtd-uri.h5.out
-          tempty-dtd-uri.h5.out.err
-          tempty-dtd.h5.out
-          tempty-dtd.h5.out.err
-          tempty-nons-2.h5.out
-          tempty-nons-2.h5.out.err
-          tempty-nons-uri.h5.out
-          tempty-nons-uri.h5.out.err
-          tempty-nons.h5.out
-          tempty-nons.h5.out.err
-          tempty-ns-2.h5.out
-          tempty-ns-2.h5.out.err
-          tempty-ns.h5.out
-          tempty-ns.h5.out.err
-          tempty.h5.out
-          tempty.h5.out.err
-          tenum.h5.out
-          tenum.h5.out.err
-          test35.nc.out
-          test35.nc.out.err
-          textlink.h5.out
-          textlink.h5.out.err
-          tfpformat.h5.out
-          tfpformat.h5.out.err
-          tgroup.h5.out
-          tgroup.h5.out.err
-          thlink.h5.out
-          thlink.h5.out.err
-          tloop.h5.out
-          tloop.h5.out.err
-          tloop2.h5.out
-          tloop2.h5.out.err
-          tmany.h5.out
-          tmany.h5.out.err
-          tname-amp.h5.out
-          tname-amp.h5.out.err
-          tname-apos.h5.out
-          tname-apos.h5.out.err
-          tname-gt.h5.out
-          tname-gt.h5.out.err
-          tname-lt.h5.out
-          tname-lt.h5.out.err
-          tname-quot.h5.out
-          tname-quot.h5.out.err
-          tname-sp.h5.out
-          tname-sp.h5.out.err
-          tnamed_dtype_attr.h5.out
-          tnamed_dtype_attr.h5.out.err
-          tnestedcomp.h5.out
-          tnestedcomp.h5.out.err
-          tnodata.h5.out
-          tnodata.h5.out.err
-          tnoname.h5.out
-          tnoname.h5.out.err
-          tnullspace.h5.out
-          tnullspace.h5.out.err
-          tobjref.h5.out
-          tobjref.h5.out.err
-          topaque.h5.out
-          topaque.h5.out.err
-          torderattr1.h5.out
-          torderattr1.h5.out.err
-          torderattr2.h5.out
-          torderattr2.h5.out.err
-          torderattr3.h5.out
-          torderattr3.h5.out.err
-          torderattr4.h5.out
-          torderattr4.h5.out.err
-          tref-escapes-at.h5.out
-          tref-escapes-at.h5.out.err
-          tref-escapes.h5.out
-          tref-escapes.h5.out.err
-          tref.h5.out
-          tref.h5.out.err
-          tsaf.h5.out
-          tsaf.h5.out.err
-          tslink.h5.out
-          tslink.h5.out.err
-          tstr.h5.out
-          tstr.h5.out.err
-          tstr2.h5.out
-          tstr2.h5.out.err
-          tstring.h5.out
-          tstring.h5.out.err
-          tstring-at.h5.out
-          tstring-at.h5.out.err
-          tudlink.h5.out
-          tudlink.h5.out.err
-          tvldtypes1.h5.out
-          tvldtypes1.h5.out.err
-          tvldtypes2.h5.out
-          tvldtypes2.h5.out.err
-          tvldtypes3.h5.out
-          tvldtypes3.h5.out.err
-          tvldtypes4.h5.out
-          tvldtypes4.h5.out.err
-          tvldtypes5.h5.out
-          tvldtypes5.h5.out.err
-          tvlstr.h5.out
-          tvlstr.h5.out.err
-    )
-    set_tests_properties (H5DUMP-XML-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml")
-    if (last_xml_test)
-      set_tests_properties (H5DUMP-XML-clearall-objects PROPERTIES DEPENDS ${last_xml_test})
-    endif ()
-    set (last_test "H5DUMP-XML-clearall-objects")
-  endif ()
-
   ########## test XML
   ADD_XML_H5_TEST (tall.h5 0 tall.h5)
   ADD_XML_H5_TEST (tattr.h5 0 tattr.h5)
diff --git a/tools/test/h5format_convert/CMakeLists.txt b/tools/test/h5format_convert/CMakeLists.txt
index 019252f..55d5623 100644
--- a/tools/test/h5format_convert/CMakeLists.txt
+++ b/tools/test/h5format_convert/CMakeLists.txt
@@ -22,7 +22,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   target_link_libraries (h5fc_gentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
   set_target_properties (h5fc_gentest PROPERTIES FOLDER generator/tools)
 
-  #add_test (NAME h5fc_gentest COMMAND $<TARGET_FILE:h5fc_gentest>)
+  #add_test (NAME h5fc_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5fc_gentest>)
 endif ()
 
 include (CMakeTests.cmake)
diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake
index e1abc48..398866c 100644
--- a/tools/test/h5format_convert/CMakeTests.cmake
+++ b/tools/test/h5format_convert/CMakeTests.cmake
@@ -108,11 +108,7 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5FC-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/outtmp.h5
-              ./testfiles/${testname}.out
-              ./testfiles/${testname}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/outtmp.h5
       )
       if (last_test)
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -120,13 +116,13 @@
       if (${testfile})
           add_test (
               NAME H5FC-${testname}-${testfile}-tmpfile
-              COMMAND    ${CMAKE_COMMAND}
-                  -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
+              COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
           )
           set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
           add_test (
               NAME H5FC-${testname}-${testfile}
               COMMAND "${CMAKE_COMMAND}"
+                  -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                   -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_ext}>"
                   -D "TEST_ARGS=${ARGN};outtmp.h5"
                   -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -142,6 +138,7 @@
           add_test (
               NAME H5FC-${testname}-NA
               COMMAND "${CMAKE_COMMAND}"
+                  -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                   -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_ext}>"
                   -D "TEST_ARGS=${ARGN}"
                   -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -161,24 +158,20 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5FC-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/outtmp.h5
-              ./testfiles/${testname}.out
-              ./testfiles/${testname}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/outtmp.h5
       )
       if (last_test)
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
       endif ()
       add_test (
           NAME H5FC-${testname}-${testfile}-tmpfile
-          COMMAND    ${CMAKE_COMMAND}
-              -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
       )
       set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
       add_test (
           NAME H5FC-${testname}-${testfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_ext}>"
               -D "TEST_ARGS=${ARGN};outtmp.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -197,24 +190,20 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5FC-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/outtmp.h5
-              ./testfiles/${testname}.out
-              ./testfiles/${testname}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/outtmp.h5
       )
       if (last_test)
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
       endif ()
       add_test (
           NAME H5FC-${testname}-${testfile}-tmpfile
-          COMMAND    ${CMAKE_COMMAND}
-              -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
       )
       set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
       add_test (
           NAME H5FC-${testname}-${testfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_ext}>"
               -D "TEST_ARGS=${ARGN};outtmp.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -234,24 +223,20 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5FC-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/tmp.h5
-              ./testfiles/${testname}.out
-              ./testfiles/${testname}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/tmp.h5
       )
       if (last_test)
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
       endif ()
       add_test (
           NAME H5FC-${testname}-tmpfile
-          COMMAND    ${CMAKE_COMMAND}
-              -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} testfiles/tmp.h5
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} testfiles/tmp.h5
       )
       set_tests_properties (H5FC-${testname}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
       add_test (
           NAME H5FC-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_ext}>"
               -D "TEST_ARGS=${ARGN};./testfiles/tmp.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -270,7 +255,7 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5FC_CHECK_IDX-${testname}
-          COMMAND "$<TARGET_FILE:h5fc_chk_idx>" "./testfiles/tmp.h5" "${ARGN}"
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5fc_chk_idx> ./testfiles/tmp.h5 ${ARGN}
       )
       set_tests_properties (H5FC_CHECK_IDX-${testname} PROPERTIES DEPENDS "H5FC-${dependtest}")
     endif ()
@@ -281,24 +266,20 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5FC-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/chktmp.h5
-              ./testfiles/${testname}.out
-              ./testfiles/${testname}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/chktmp.h5
       )
       if (last_test)
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
       endif ()
       add_test (
           NAME H5FC-${testname}-tmpfile
-          COMMAND    ${CMAKE_COMMAND}
-              -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} testfiles/chktmp.h5
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} testfiles/chktmp.h5
       )
       set_tests_properties (H5FC-${testname}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
       add_test (
           NAME H5FC-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_ext}>"
               -D "TEST_ARGS=-d;${ARGN};./testfiles/chktmp.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -310,7 +291,7 @@
       set_tests_properties (H5FC-${testname} PROPERTIES DEPENDS "H5FC-${testname}-tmpfile")
       add_test (
           NAME H5FC_CHECK_IDX-${testname}
-          COMMAND "$<TARGET_FILE:h5fc_chk_idx>" "./testfiles/chktmp.h5" "${ARGN}"
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5fc_chk_idx> ./testfiles/chktmp.h5 ${ARGN}
       )
       set_tests_properties (H5FC_CHECK_IDX-${testname} PROPERTIES DEPENDS "H5FC-${testname}")
       set (last_test "H5FC_CHECK_IDX-${testname}")
@@ -318,30 +299,24 @@
   endmacro ()
 
   macro (ADD_H5_H5DUMP_CHECK testname)
-    # If using memchecker add tests without using scripts
+    # If using memchecker skip tests
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5FC-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ./testfiles/dmptmp.h5
-              ./testfiles/${testname}.out
-              ./testfiles/${testname}.out.err
-              ./testfiles/${testname}_chk.out
-              ./testfiles/${testname}_chk.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/dmptmp.h5
       )
       if (last_test)
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
       endif ()
       add_test (
           NAME H5FC-${testname}-tmpfile
-          COMMAND    ${CMAKE_COMMAND}
-              -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testname}.h5 testfiles/dmptmp.h5
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testname}.h5 testfiles/dmptmp.h5
       )
       set_tests_properties (H5FC-${testname}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
       add_test (
           NAME H5FC-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_ext}>"
               -D "TEST_ARGS=${ARGN};./testfiles/dmptmp.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -354,6 +329,7 @@
       add_test (
           NAME H5FC_CHECK_DUMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=-BH;./testfiles/dmptmp.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -377,60 +353,7 @@
     # Remove any output file left over from previous test run
     add_test (
       NAME H5FC-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          h5fc_help.out
-          h5fc_help.out.err
-          h5fc_nooption.out
-          h5fc_nooption.out.err
-          h5fc_nonexistfile.out
-          h5fc_nonexistfile.out.err
-          h5fc_d_file.out
-          h5fc_d_file.out.err
-          h5fc_d_file-d.out
-          h5fc_d_file-d.out.err
-          h5fc_dname.out
-          h5fc_dname.out.err
-          h5fc_nonexistdset_file.out
-          h5fc_nonexistdset_file.out.err
-          h5fc_v_non_chunked.out
-          h5fc_v_non_chunked.out.err
-          h5fc_v_bt1.out
-          h5fc_v_bt1.out.err
-          h5fc_v_ndata_bt1.out
-          h5fc_v_ndata_bt1.out.err
-          h5fc_v_all.out
-          h5fc_v_all.out.err
-          h5fc_v_n_1d.out
-          h5fc_v_n_1d.out.err
-          h5fc_v_n_all.out
-          h5fc_v_n_all.out.err
-          h5fc_ext1_i.out
-          h5fc_ext1_i.out.err
-          h5fc_ext1_s.out
-          h5fc_ext1_s.out.err
-          h5fc_ext1_f.out
-          h5fc_ext1_f.out.err
-          h5fc_ext2_if.out
-          h5fc_ext2_if.out.err
-          h5fc_ext2_is.out
-          h5fc_ext2_is.out.err
-          h5fc_ext2_sf.out
-          h5fc_ext2_sf.out.err
-          h5fc_ext3_isf.out
-          h5fc_ext3_isf.out.err
-          old_h5fc_ext1_i.out
-          old_h5fc_ext1_i.out.err
-          old_h5fc_ext1_s.out
-          old_h5fc_ext1_s.out.err
-          old_h5fc_ext1_f.out
-          old_h5fc_ext1_f.out.err
-          old_h5fc_ext2_if.out
-          old_h5fc_ext2_is.out.err
-          old_h5fc_ext2_is.out
-          old_h5fc_ext2_sf.out.err
-          old_h5fc_ext3_isf.out
-          old_h5fc_ext3_isf.out.err
+      COMMAND ${CMAKE_COMMAND} -E remove
           outtmp.h5
           tmp.h5
           chktmp.h5
diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake
index 9d36276..22ab848 100644
--- a/tools/test/h5import/CMakeTests.cmake
+++ b/tools/test/h5import/CMakeTests.cmake
@@ -105,30 +105,28 @@
   macro (ADD_H5_TEST testname importfile conffile testfile)
     # If using memchecker skip macro based tests
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5IMPORT-${testname} COMMAND $<TARGET_FILE:h5import${tgt_ext}> ${importfile} -c ${conffile} -o ${testfile})
-      if (last_test)
-        set_tests_properties (H5IMPORT-${testname} PROPERTIES DEPENDS H5IMPORT-h5importtest)
-      endif ()
+      add_test (NAME H5IMPORT-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5import${tgt_ext}> ${importfile} -c ${conffile} -o ${testfile})
+      set_tests_properties (H5IMPORT-${testname} PROPERTIES
+          FIXTURES_REQUIRED set_h5importtest
+      )
     else ()
       add_test (
           NAME H5IMPORT-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${testfile}
-              ${testfile}.new
-              ${testfile}.new.err
-              ${testfile}.out
-              ${testfile}.out.err
-              ${testfile}
+          COMMAND ${CMAKE_COMMAND} -E remove ${testfile}
+      )
+      set_tests_properties (H5IMPORT-${testname}-clear-objects PROPERTIES
+          FIXTURES_REQUIRED set_h5importtest
       )
-      set_tests_properties (H5IMPORT-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
 
-      add_test (NAME H5IMPORT-${testname} COMMAND $<TARGET_FILE:h5import${tgt_ext}> ${importfile} -c ${conffile} -o ${testfile})
-      set_tests_properties (H5IMPORT-${testname} PROPERTIES DEPENDS H5IMPORT-${testname}-clear-objects)
+      add_test (NAME H5IMPORT-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5import${tgt_ext}> ${importfile} -c ${conffile} -o ${testfile})
+      set_tests_properties (H5IMPORT-${testname} PROPERTIES
+          DEPENDS H5IMPORT-${testname}-clear-objects
+      )
 
       add_test (
           NAME H5IMPORT-${testname}-H5DMP
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${testfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -138,10 +136,13 @@
               -D "TEST_SKIP_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5IMPORT-${testname}-H5DMP PROPERTIES DEPENDS H5IMPORT-${testname})
+      set_tests_properties (H5IMPORT-${testname}-H5DMP PROPERTIES
+          DEPENDS H5IMPORT-${testname}
+      )
       add_test (
           NAME H5IMPORT-${testname}-H5DMP_CMP
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=testfiles/${testfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -151,7 +152,9 @@
               -D "TEST_REFERENCE=${testfile}.new"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5IMPORT-${testname}-H5DMP_CMP PROPERTIES DEPENDS H5IMPORT-${testname}-H5DMP)
+      set_tests_properties (H5IMPORT-${testname}-H5DMP_CMP PROPERTIES
+          DEPENDS H5IMPORT-${testname}-H5DMP
+      )
     endif ()
   endmacro ()
 
@@ -160,23 +163,19 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5IMPORT-DUMP-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
+          COMMAND ${CMAKE_COMMAND} -E remove
               d${testfile}
               d${testfile}.bin
-              d${testfile}.dmp
-              d${testfile}.dmp.err
-              d${testfile}.imp
-              d${testfile}.imp.err
-              d${testfile}.dff
-              d${testfile}.dff.err
       )
-      set_tests_properties (H5IMPORT-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
+      set_tests_properties (H5IMPORT-DUMP-${testname}-clear-objects PROPERTIES
+          DEPENDS H5IMPORT-${testname}-H5DMP_CMP
+      )
 
       if ("${ARGN}" STREQUAL "BINARY")
         add_test (
             NAME H5IMPORT-DUMP-${testname}-H5DMP
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
                 -D "TEST_ARGS:STRING=-p;-d;${datasetname};-o;d${testfile}.bin;-b;NATIVE;testfiles/${testfile}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -189,6 +188,7 @@
         add_test (
             NAME H5IMPORT-DUMP-${testname}-H5DMP
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
                 -D "TEST_ARGS:STRING=-p;-d;${datasetname};-o;d${testfile}.bin;-y;--width=1;testfiles/${testfile}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -198,11 +198,14 @@
                 -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
         )
       endif ()
-      set_tests_properties (H5IMPORT-DUMP-${testname}-H5DMP PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}-clear-objects")
+      set_tests_properties (H5IMPORT-DUMP-${testname}-H5DMP PROPERTIES
+          DEPENDS "H5IMPORT-DUMP-${testname}-clear-objects"
+      )
 
       add_test (
           NAME H5IMPORT-DUMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5import${tgt_ext}>"
               -D "TEST_ARGS:STRING=d${testfile}.bin;-c;d${testfile}.dmp;-o;d${testfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -211,11 +214,14 @@
               -D "TEST_SKIP_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5IMPORT-DUMP-${testname} PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}-H5DMP")
+      set_tests_properties (H5IMPORT-DUMP-${testname} PROPERTIES
+          DEPENDS "H5IMPORT-DUMP-${testname}-H5DMP"
+      )
 
       add_test (
           NAME H5IMPORT-DUMP-${testname}-H5DFF
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_ext}>"
               -D "TEST_ARGS:STRING=-r;d${testfile};testfiles/${testfile};${datasetname};${datasetname}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -225,7 +231,9 @@
               -D "TEST_REFERENCE=testfiles/d${testfile}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5IMPORT-DUMP-${testname}-H5DFF PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}")
+      set_tests_properties (H5IMPORT-DUMP-${testname}-H5DFF PROPERTIES
+          DEPENDS "H5IMPORT-DUMP-${testname}"
+      )
     endif ()
   endmacro ()
 
@@ -234,22 +242,18 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5IMPORT_SUB-DUMP-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              d-${testname}.dmp
-              d-${testname}.dmp.err
+          COMMAND ${CMAKE_COMMAND} -E remove
               d-${testname}.h5
-              ${testname}.dmp
-              ${testname}.dmp.err
-              ${testname}.imp
-              ${testname}.imp.err
               ${testname}.bin
       )
-      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
+      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-clear-objects PROPERTIES
+          FIXTURES_REQUIRED set_h5importtest
+      )
 
       add_test (
           NAME H5IMPORT_SUB-DUMP-${testname}-H5DMP
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=-p;-d;${datasetname};${ARGN};-o;${testname}.bin;-b;NATIVE;testfiles/${testfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -258,11 +262,14 @@
               -D "TEST_SKIP_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5DMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-clear-objects")
+      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5DMP PROPERTIES
+          DEPENDS "H5IMPORT_SUB-DUMP-${testname}-clear-objects"
+      )
 
       add_test (
           NAME H5IMPORT_SUB-DUMP-${testname}-H5IMP
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5import${tgt_ext}>"
               -D "TEST_ARGS:STRING=${testname}.bin;-c;${testname}.dmp;-o;d-${testname}.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -271,10 +278,13 @@
               -D "TEST_SKIP_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5IMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5DMP")
+      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5IMP PROPERTIES
+          DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5DMP"
+      )
       add_test (
           NAME H5IMPORT_SUB-DUMP-${testname}-CMP
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=-p;d-${testname}.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -283,7 +293,9 @@
               -D "TEST_REFERENCE=testfiles/${testname}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-CMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5IMP")
+      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-CMP PROPERTIES
+         DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5IMP"
+      )
     endif ()
   endmacro ()
 
@@ -314,8 +326,7 @@
     # Remove any output file left over from previous test run
     add_test (
         NAME H5IMPORT-clear-objects
-        COMMAND    ${CMAKE_COMMAND}
-            -E remove
+        COMMAND ${CMAKE_COMMAND} -E remove
             binfp64.bin
             binin8.bin
             binin8w.bin
@@ -324,164 +335,40 @@
             binuin16.bin
             binuin32.bin
             txtin32.h5
-            txtin32.h5.new
-            txtin32.h5.new.err
-            txtin32.h5.out
-            txtin32.h5.out.err
             txtin16.h5
-            txtin16.h5.new
-            txtin16.h5.new.err
-            txtin16.h5.out
-            txtin16.h5.out.err
             txtin8.h5
-            txtin8.h5.new
-            txtin8.h5.new.err
-            txtin8.h5.out
-            txtin8.h5.out.err
             txtuin16.h5
-            txtuin16.h5.new
-            txtuin16.h5.new.err
-            txtuin16.h5.out
-            txtuin16.h5.out.err
             txtuin32.h5
-            txtuin32.h5.new
-            txtuin32.h5.new.err
-            txtuin32.h5.out
-            txtuin32.h5.out.err
             txtfp32.h5
-            txtfp32.h5.new
-            txtfp32.h5.new.err
-            txtfp32.h5.out
-            txtfp32.h5.out.err
             txtfp64.h5
-            txtfp64.h5.new
-            txtfp64.h5.new.err
-            txtfp64.h5.out
-            txtfp64.h5.out.err
             binfp64.h5
-            binfp64.h5.new
-            binfp64.h5.new.err
-            binfp64.h5.out
-            binfp64.h5.out.err
             binin8.h5
-            binin8.h5.new
-            binin8.h5.new.err
-            binin8.h5.out
-            binin8.h5.out.err
             binin8w.h5
-            binin8w.h5.new
-            binin8w.h5.new.err
-            binin8w.h5.out
-            binin8w.h5.out.err
             binin16.h5
-            binin16.h5.new
-            binin16.h5.new.err
-            binin16.h5.out
-            binin16.h5.out.err
             binin32.h5
-            binin32.h5.new
-            binin32.h5.new.err
-            binin32.h5.out
-            binin32.h5.out.err
             binuin16.h5
-            binuin16.h5.new
-            binuin16.h5.new.err
-            binuin16.h5.out
-            binuin16.h5.out.err
             binuin32.h5
-            binuin32.h5.new
-            binuin32.h5.new.err
-            binuin32.h5.out
-            binuin32.h5.out.err
             txtstr.h5
-            txtstr.h5.new
-            txtstr.h5.new.err
-            txtstr.h5.out
-            txtstr.h5.out.err
             textpfe.h5
-            textpfe.h5.new
-            textpfe.h5.new.err
-            textpfe.h5.out
-            textpfe.h5.out.err
             dbinfp64.h5
             dbinfp64.h5.bin
-            dbinfp64.h5.imp
-            dbinfp64.h5.imp.err
-            dbinfp64.h5.dmp
-            dbinfp64.h5.dmp.err
-            dbinfp64.h5.dff
-            dbinfp64.h5.dff.err
             dbinin8.h5
             dbinin8.h5.bin
-            dbinin8.h5.imp
-            dbinin8.h5.imp.err
-            dbinin8.h5.dmp
-            dbinin8.h5.dmp.err
-            dbinin8.h5.dff
-            dbinin8.h5.dff.err
             dbinin8w.h5
             dbinin8w.h5.bin
-            dbinin8w.h5.imp
-            dbinin8w.h5.imp.err
-            dbinin8w.h5.dmp
-            dbinin8w.h5.dmp.err
-            dbinin8w.h5.dff
-            dbinin8w.h5.dff.err
             dbinin16.h5
             dbinin16.h5.bin
-            dbinin16.h5.imp
-            dbinin16.h5.imp.err
-            dbinin16.h5.dmp
-            dbinin16.h5.dmp.err
-            dbinin16.h5.dff
-            dbinin16.h5.dff.err
             dbinin32.h5
             dbinin32.h5.bin
-            dbinin32.h5.imp
-            dbinin32.h5.imp.err
-            dbinin32.h5.dmp
-            dbinin32.h5.dmp.err
-            dbinin32.h5.dff
-            dbinin32.h5.dff.err
             dbinuin16.h5
             dbinuin16.h5.bin
-            dbinuin16.h5.imp
-            dbinuin16.h5.imp.err
-            dbinuin16.h5.dmp
-            dbinuin16.h5.dmp.err
-            dbinuin16.h5.dff
-            dbinuin16.h5.dff.err
             dbinuin32.h5
             dbinuin32.h5.bin
-            dbinuin32.h5.imp
-            dbinuin32.h5.imp.err
-            dbinuin32.h5.dmp
-            dbinuin32.h5.dmp.err
-            dbinuin32.h5.dff
-            dbinuin32.h5.dff.err
             dtxtstr.h5
             dtxtstr.h5.bin
-            dtxtstr.h5.imp
-            dtxtstr.h5.imp.err
-            dtxtstr.h5.dmp
-            dtxtstr.h5.dmp.err
-            dtxtstr.h5.dff
-            dtxtstr.h5.dff.err
-            tall_fp32.dmp
-            tall_fp32.dmp.err
             tall_fp32.bin
-            tall_fp32.imp
-            tall_fp32.imp.err
-            d-tall_fp32.dmp
-            d-tall_fp32.dmp.err
             d-tall_fp32.h5
-            tall_i32.dmp
-            tall_i32.dmp.err
             tall_i32.bin
-            tall_i32.imp
-            tall_i32.imp.err
-            d-tall_i32.dmp
-            d-tall_i32.dmp.err
             d-tall_i32.h5
     )
     set (last_test "H5IMPORT-clear-objects")
@@ -489,8 +376,7 @@
 
   add_test (
       NAME H5IMPORT-h5importtest-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
+      COMMAND ${CMAKE_COMMAND} -E remove
           binfp64.bin
           binfp64.conf
           binin8.bin
@@ -506,13 +392,12 @@
           binuin32.bin
           binuin32.conf
   )
-  if (last_test)
-    set_tests_properties (H5IMPORT-h5importtest-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "H5IMPORT-clear-objects")
 
-  add_test (NAME H5IMPORT-h5importtest COMMAND $<TARGET_FILE:h5importtest>)
-  set_tests_properties (H5IMPORT-h5importtest PROPERTIES DEPENDS H5IMPORT-h5importtest-clear-objects)
+  add_test (NAME H5IMPORT-h5importtest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5importtest>)
+  set_tests_properties (H5IMPORT-h5importtest PROPERTIES
+      FIXTURES_SETUP set_h5importtest
+      DEPENDS H5IMPORT-h5importtest-clear-objects
+  )
 
   # ----- TESTING "ASCII I32 rank 3 - Output BE " ;
   ADD_H5_TEST (ASCII_I32 testfiles/txtin32.txt testfiles/txtin32.conf txtin32.h5)
diff --git a/tools/test/h5jam/CMakeLists.txt b/tools/test/h5jam/CMakeLists.txt
index 585a8a1..6fdf7b0 100644
--- a/tools/test/h5jam/CMakeLists.txt
+++ b/tools/test/h5jam/CMakeLists.txt
@@ -11,7 +11,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   target_link_libraries (h5jamgentest PRIVATE ${HDF5_LIB_TARGET})
   set_target_properties (h5jamgentest PROPERTIES FOLDER generator/tools)
 
-  #add_test (NAME h5jamgentest COMMAND $<TARGET_FILE:h5jamgentest>)
+  #add_test (NAME h5jamgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5jamgentest>)
 endif ()
 
 add_executable (getub ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/getub.c)
diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake
index 84af48b..f108afc 100644
--- a/tools/test/h5jam/CMakeTests.cmake
+++ b/tools/test/h5jam/CMakeTests.cmake
@@ -60,21 +60,15 @@
   macro (TEST_H5JAM_OUTPUT expectfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5JAM-${expectfile} COMMAND $<TARGET_FILE:h5jam${tgt_ext}> ${ARGN})
+      add_test (NAME H5JAM-${expectfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5jam${tgt_ext}> ${ARGN})
       if (${resultcode})
         set_tests_properties (H5JAM-${expectfile} PROPERTIES WILL_FAIL "true")
       endif ()
     else ()
       add_test (
-          NAME H5JAM-${expectfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${expectfile}.out
-              ${expectfile}.out.err
-      )
-      add_test (
           NAME H5JAM-${expectfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5jam${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -85,7 +79,6 @@
               -D "TEST_REFERENCE=testfiles/${expectfile}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5JAM-${expectfile} PROPERTIES DEPENDS "H5JAM-${expectfile}-clear-objects")
     endif ()
   endmacro ()
 
@@ -96,21 +89,15 @@
   macro (TEST_H5UNJAM_OUTPUT expectfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5JAM-UNJAM-${expectfile} COMMAND $<TARGET_FILE:h5unjam${tgt_ext}> ${ARGN})
+      add_test (NAME H5JAM-UNJAM-${expectfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5unjam${tgt_ext}> ${ARGN})
       if (${resultcode})
         set_tests_properties (H5JAM-UNJAM-${expectfile} PROPERTIES WILL_FAIL "true")
       endif ()
     else ()
       add_test (
-          NAME H5JAM-UNJAM-${expectfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${expectfile}.out
-              ${expectfile}.out.err
-      )
-      add_test (
           NAME H5JAM-UNJAM-${expectfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5unjam${tgt_ext}>"
               -D "TEST_ARGS=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -119,7 +106,6 @@
               -D "TEST_REFERENCE=testfiles/${expectfile}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5JAM-UNJAM-${expectfile} PROPERTIES DEPENDS "H5JAM-UNJAM-${expectfile}-clear-objects")
     endif ()
   endmacro ()
 
@@ -127,18 +113,9 @@
     # If using memchecker add tests without using scripts
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
-          NAME H5JAM-${testname}-CHECKFILE-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${actual}.new
-              ${actual}.new.err
-              ${actual}.out
-              ${actual}.out.err
-      )
-      set_tests_properties (H5JAM-${testname}-CHECKFILE-clear-objects PROPERTIES DEPENDS ${testdepends})
-      add_test (
           NAME H5JAM-${testname}-CHECKFILE-H5DMP
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=testfiles/${expected}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -148,10 +125,11 @@
               -D "TEST_SKIP_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS H5JAM-${testname}-CHECKFILE-clear-objects)
+      set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS ${testdepends})
       add_test (
           NAME H5JAM-${testname}-CHECKFILE-H5DMP_CMP
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=${actual}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -187,7 +165,7 @@
             COMMAND ${CMAKE_COMMAND} -E remove ${ufile}
         )
         set_tests_properties (H5JAM-${testname}-UNJAM_D-clear-objects PROPERTIES DEPENDS H5JAM-${testname}-UNJAM-clear-objects)
-        add_test (NAME H5JAM-${testname}-UNJAM COMMAND $<TARGET_FILE:h5unjam${tgt_ext}> -i ${infile} -u ${ufile} -o ${outfile})
+        add_test (NAME H5JAM-${testname}-UNJAM COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5unjam${tgt_ext}> -i ${infile} -u ${ufile} -o ${outfile})
         set_tests_properties (H5JAM-${testname}-UNJAM PROPERTIES DEPENDS H5JAM-${testname}-UNJAM_D-clear-objects)
         set (compare_test ${ufile})
       else ()
@@ -195,6 +173,7 @@
           add_test (
               NAME H5JAM-${testname}-UNJAM
               COMMAND "${CMAKE_COMMAND}"
+                  -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                   -D "TEST_PROGRAM=$<TARGET_FILE:h5unjam${tgt_ext}>"
                   -D "TEST_ARGS:STRING=-i;${infile};-o;${outfile}"
                   -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -206,7 +185,7 @@
           set_tests_properties (H5JAM-${testname}-UNJAM PROPERTIES DEPENDS H5JAM-${testname}-UNJAM-clear-objects)
           set (compare_test "${outfile}.ufile.txt")
         else ()
-          add_test (NAME H5JAM-${testname}-UNJAM COMMAND $<TARGET_FILE:h5unjam${tgt_ext}> -i ${infile} -o ${outfile})
+          add_test (NAME H5JAM-${testname}-UNJAM COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5unjam${tgt_ext}> -i ${infile} -o ${outfile})
           set_tests_properties (H5JAM-${testname}-UNJAM PROPERTIES DEPENDS H5JAM-${testname}-UNJAM-clear-objects)
           set (compare_test "")
         endif ()
@@ -214,8 +193,7 @@
       if (${compare_test})
         add_test (
             NAME H5JAM-${testname}-UNJAM-CHECK_UB_1-clear-objects
-            COMMAND    ${CMAKE_COMMAND}
-                -E remove
+            COMMAND ${CMAKE_COMMAND} -E remove
                 ${infile}.len.txt
                 ${infile}.cmp
                 ${infile}-ub.cmp
@@ -224,6 +202,7 @@
         add_test (
             NAME H5JAM-${testname}-UNJAM-CHECK_UB_1
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:tellub>"
                 -D "TEST_GET_PROGRAM=$<TARGET_FILE:getub>"
                 -D "TEST_CHECKUB=YES"
@@ -240,6 +219,7 @@
       add_test (
           NAME H5JAM-${testname}-UNJAM-CHECK_NOUB
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:tellub>"
               -D "TEST_GET_PROGRAM=$<TARGET_FILE:getub>"
               -D "TEST_CHECKUB=NO"
@@ -267,7 +247,7 @@
           COMMAND ${CMAKE_COMMAND} -E remove ${outfile} ${infile}.cpy.h5
       )
     endif ()
-    add_test (NAME H5JAM-${testname} COMMAND $<TARGET_FILE:h5jam${tgt_ext}> -u testfiles/${jamfile} -i testfiles/${infile} -o ${outfile} ${ARGN})
+    add_test (NAME H5JAM-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5jam${tgt_ext}> -u testfiles/${jamfile} -i testfiles/${infile} -o ${outfile} ${ARGN})
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       set_tests_properties (H5JAM-${testname} PROPERTIES DEPENDS H5JAM-${testname}-clear-objects)
       set (compare_test ${outfile})
@@ -278,8 +258,7 @@
 
       add_test (
           NAME H5JAM-${testname}-CHECK_UB_1-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
+          COMMAND ${CMAKE_COMMAND} -E remove
               ${compare_test}.len.txt
               ${compare_test}.cmp
               ${compare_test}-ub.cmp
@@ -288,6 +267,7 @@
       add_test (
           NAME H5JAM-${testname}-CHECK_UB_1
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:tellub>"
               -D "TEST_GET_PROGRAM=$<TARGET_FILE:getub>"
               -D "TEST_CHECKUB=YES"
@@ -322,7 +302,7 @@
       )
       set_tests_properties (H5JAM-${testname}_NONE_COPY PROPERTIES DEPENDS H5JAM-${testname}_NONE-SETUP)
 
-      add_test (NAME H5JAM-${testname}_NONE COMMAND $<TARGET_FILE:h5jam${tgt_ext}> -u testfiles/${jamfile} -i ${chkfile} ${ARGN})
+      add_test (NAME H5JAM-${testname}_NONE COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5jam${tgt_ext}> -u testfiles/${jamfile} -i ${chkfile} ${ARGN})
       set_tests_properties (H5JAM-${testname}_NONE PROPERTIES DEPENDS H5JAM-${testname}_NONE_COPY)
 
       set (compare_test ${chkfile})
@@ -333,8 +313,7 @@
 
       add_test (
           NAME H5JAM-${testname}_NONE-CHECK_UB_1-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
+          COMMAND ${CMAKE_COMMAND} -E remove
               ${compare_test}.len.txt
               ${compare_test}.cmp
               ${compare_test}-ub.cmp
@@ -343,6 +322,7 @@
       add_test (
           NAME H5JAM-${testname}_NONE-CHECK_UB_1
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:tellub>"
               -D "TEST_GET_PROGRAM=$<TARGET_FILE:getub>"
               -D "TEST_CHECKUB=YES"
diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake
index cd62297..2f3f3ab 100644
--- a/tools/test/h5ls/CMakeTests.cmake
+++ b/tools/test/h5ls/CMakeTests.cmake
@@ -143,26 +143,17 @@
   macro (ADD_H5_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5LS-${resultfile} COMMAND $<TARGET_FILE:h5ls${tgt_ext}> ${ARGN})
+      add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls${tgt_ext}> ${ARGN})
       set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
       if (${resultcode} EQUAL 1)
         set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
-      if (last_test)
-        set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
     else ()
       # Remove any output file left over from previous test run
       add_test (
-          NAME H5LS-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/${resultfile}.out
-              testfiles/${resultfile}.out.err
-      )
-      add_test (
           NAME H5LS-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5ls${tgt_ext}>"
               -D "TEST_ARGS=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -171,33 +162,22 @@
               -D "TEST_REFERENCE=${resultfile}.ls"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
   macro (ADD_H5_ERR_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5LS-${resultfile} COMMAND $<TARGET_FILE:h5ls> ${ARGN})
+      add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls> ${ARGN})
       set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
       if (${resultcode} EQUAL 1)
         set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
-      if (last_test)
-        set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
     else ()
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5LS-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/${resultfile}.out
-              testfiles/${resultfile}.out.err
-      )
       add_test (
           NAME H5LS-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5ls${tgt_ext}>"
               -D "TEST_ARGS=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -207,23 +187,15 @@
               -D "TEST_ERRREF=${resultfile}.err"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
   macro (ADD_H5_UD_TEST testname resultcode resultfile)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      # Remove any output file left over from previous test run
-      add_test (
-          NAME H5LS_UD-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              testfiles/${resultfile}.out
-              testfiles/${resultfile}.out.err
-      )
       add_test (
           NAME H5LS_UD-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5ls${tgt_ext}>"
               -D "TEST_ARGS=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -235,7 +207,6 @@
               -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5LS_UD-${testname} PROPERTIES DEPENDS H5LS_UD-${testname}-clear-objects)
     endif ()
   endmacro ()
 
@@ -245,128 +216,6 @@
 ##############################################################################
 ##############################################################################
 
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    # Remove any output file left over from previous test run
-    add_test (
-      NAME H5LS-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          help-1.out
-          help-1.out.err
-          help-2.out
-          help-2.out.err
-          help-3.out
-          help-3.out.err
-          nosuchfile.out
-          nosuchfile.out.err
-          tall-1.out
-          tall-1.out.err
-          tall-2.out
-          tall-2.out.err
-          tarray1.out
-          tarray1.out.err
-          tattr2.out
-          tattr2.out.err
-          tcomp-1.out
-          tcomp-1.out.err
-          tdataregbe.out
-          tdataregbe.out.err
-          tdataregle.out
-          tdataregle.out.err
-          tdset-1.out
-          tdset-1.out.err
-          tempty.out
-          tempty.out.err
-          textlink-1.out
-          textlink-1.out.err
-          textlinksrc-1.out
-          textlinksrc-1.out.err
-          textlinksrc-2.out
-          textlinksrc-2.out.err
-          textlinksrc-3.out
-          textlinksrc-3.out.err
-          textlinksrc-4.out
-          textlinksrc-4.out.err
-          textlinksrc-5.out
-          textlinksrc-5.out.err
-          textlinksrc-6.out
-          textlinksrc-6.out.err
-          textlinksrc-7.out
-          textlinksrc-7.out.err
-          textlinksrc-1-old.out
-          textlinksrc-1-old.out.err
-          textlinksrc-2-old.out
-          textlinksrc-2-old.out.err
-          textlinksrc-3-old.out
-          textlinksrc-3-old.out.err
-          textlinksrc-6-old.out
-          textlinksrc-6-old.out.err
-          textlinksrc-7-old.out
-          textlinksrc-7-old.out.err
-          tgrp_comments.out
-          tgrp_comments.out.err
-          tgrpnullspace.out
-          tgrpnullspace.out.err
-          tsoftlinks-1.out
-          tsoftlinks-1.out.err
-          tsoftlinks-2.out
-          tsoftlinks-2.out.err
-          tsoftlinks-3.out
-          tsoftlinks-3.out.err
-          tsoftlinks-4.out
-          tsoftlinks-4.out.err
-          tsoftlinks-5.out
-          tsoftlinks-5.out.err
-          textlinksrc-nodangle-1.out
-          textlinksrc-nodangle-1.out.err
-          textlinksrc-nodangle-2.out
-          textlinksrc-nodangle-2.out.err
-          tsoftlinks-nodangle-1.out
-          tsoftlinks-nodangle-1.out.err
-          thlinks-nodangle-1.out
-          thlinks-nodangle-1.out.err
-          tgroup.out
-          tgroup.out.err
-          tgroup-1.out
-          tgroup-1.out.err
-          tgroup-2.out
-          tgroup-2.out.err
-          tgroup-3.out
-          tgroup-3.out.err
-          thlink-1.out
-          thlink-1.out.err
-          tloop-1.out
-          tloop-1.out.err
-          tnestcomp-1.out
-          tnestcomp-1.out.err
-          tnestcomp-2.out
-          tnestcomp-2.out.err
-          tnestcomp-3.out
-          tnestcomp-3.out.err
-          tnestcomp-4.out
-          tnestcomp-4.out.err
-          tsaf.out
-          tsaf.out.err
-          tslink-1.out
-          tslink-1.out.err
-          tstr-1.out
-          tstr-1.out.err
-          tudlink-1.out
-          tudlink-1.out.err
-          tvldtypes1.out
-          tvldtypes1.out.err
-          tvldtypes2le.out
-          tvldtypes2le.out.err
-          tvldtypes2be.out
-          tvldtypes2be.out.err
-    )
-    set_tests_properties (H5LS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-    if (last_test)
-      set_tests_properties (H5LS-clearall-objects PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "H5LS-clearall-objects")
-  endif ()
-
 # See which filters are usable (and skip tests for filters we
 # don't have).  Do this by searching H5pubconf.h to see which
 # filters are defined.
diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake
index 04fb306..cf5b6d7 100644
--- a/tools/test/h5ls/CMakeTestsVDS.cmake
+++ b/tools/test/h5ls/CMakeTestsVDS.cmake
@@ -89,26 +89,16 @@
   macro (ADD_H5_VDS_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5LS-${resultfile} COMMAND $<TARGET_FILE:h5ls${tgt_ext}> ${ARGN})
+      add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls${tgt_ext}> ${ARGN})
       set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
       if (${resultcode} EQUAL 1)
         set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
-      if (last_test)
-        set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
     else ()
       add_test (
-          NAME H5LS-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5LS-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
-      add_test (
           NAME H5LS-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5ls${tgt_ext}>"
               -D "TEST_ARGS=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/vds"
@@ -117,14 +107,13 @@
               -D "TEST_REFERENCE=${resultfile}.ls"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
   macro (ADD_H5_VDS_PREFIX_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5LS_PREFIX-${resultfile} COMMAND $<TARGET_FILE:h5ls${tgt_ext}> ${ARGN})
+      add_test (NAME H5LS_PREFIX-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls${tgt_ext}> ${ARGN})
       set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES
           ENVIRONMENT "HDF5_VDS_PREFIX=\${ORIGIN}"
           WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
@@ -132,21 +121,11 @@
       if (${resultcode} EQUAL 1)
         set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
-      if (last_test)
-        set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
     else ()
       add_test (
-          NAME H5LS_PREFIX-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      set_tests_properties (H5LS_PREFIX-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds/prefix")
-      add_test (
           NAME H5LS_PREFIX-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5ls${tgt_ext}>"
               -D "TEST_ARGS=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -157,7 +136,6 @@
               -D "TEST_ENV_VALUE=\${ORIGIN}"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES DEPENDS H5LS_PREFIX-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
@@ -167,44 +145,6 @@
 ##############################################################################
 ##############################################################################
 
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    # Remove any output file left over from previous test run
-    add_test (
-      NAME H5LS_VDS-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          tvds-1.out
-          tvds-1.out.err
-          tvds-2.out
-          tvds-2.out.err
-          tvds-3_1.out
-          tvds-3_1.out.err
-          tvds-3_2.out
-          tvds-3_2.out.err
-          tvds-4.out
-          tvds-4.out.err
-          tvds-5.out
-          tvds-5.out.err
-          tvds_layout-1.out
-          tvds_layout-1.out.err
-          tvds_layout-2.out
-          tvds_layout-2.out.err
-          tvds_layout-3_1.out
-          tvds_layout-3_1.out.err
-          tvds_layout-3_2.out
-          tvds_layout-3_2.out.err
-          tvds_layout-4.out
-          tvds_layout-4.out.err
-          tvds_layout-5.out
-          tvds_layout-5.out.err
-    )
-    set_tests_properties (H5LS_VDS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
-    if (last_test)
-      set_tests_properties (H5LS_VDS-clearall-objects PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "H5LS_VDS-clearall-objects")
-  endif ()
-
   ADD_H5_VDS_TEST (tvds-1 0 -w80 -v -S 1_vds.h5)
   ADD_H5_VDS_TEST (tvds-2 0 -w80 -v -S 2_vds.h5)
   ADD_H5_VDS_TEST (tvds-3_1 0 -w80 -v -S 3_1_vds.h5)
diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
index 50be28a..cd20f77 100644
--- a/tools/test/h5repack/CMakeTests.cmake
+++ b/tools/test/h5repack/CMakeTests.cmake
@@ -166,26 +166,15 @@
   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${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} 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_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5repack${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -194,39 +183,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${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 $<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 ()
   endmacro ()
 
@@ -242,23 +235,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${tgt_ext}> --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${tgt_ext}> --enable-error-stack ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_ext}> --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 ()
 
@@ -276,26 +271,20 @@
       if (HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_CMP-${testname}
-            COMMAND $<TARGET_FILE:h5repack${tgt_ext}> ${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_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"
@@ -305,7 +294,9 @@
                 -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 ()
@@ -324,26 +315,23 @@
       if (HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_MASK-${testname}
-            COMMAND $<TARGET_FILE:h5repack${tgt_ext}> ${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_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"
@@ -371,24 +359,23 @@
     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${tgt_ext}> ${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_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"
@@ -397,7 +384,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 ()
@@ -414,24 +403,23 @@
     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${tgt_ext}> ${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_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"
@@ -440,7 +428,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 ()
@@ -458,29 +448,30 @@
       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${tgt_ext}> ${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${tgt_ext}> ${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_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"
@@ -490,7 +481,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)")
@@ -504,6 +497,7 @@
           add_test (
               NAME H5REPACK_VERIFY_LAYOUT-${testname}_DMP
               COMMAND "${CMAKE_COMMAND}"
+                  -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"
@@ -513,7 +507,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 ()
@@ -533,24 +529,23 @@
         # Remove any output file left over from previous test run
         add_test (
             NAME H5REPACK_VERIFY_LAYOUT_VDS-${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_VDS-${testname}-clear-objects PROPERTIES
+            FIXTURES_REQUIRED clear_h5repack
         )
-        if (last_test)
-          set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-        endif ()
         add_test (
             NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}
-            COMMAND $<TARGET_FILE:h5repack${tgt_ext}> ${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_VDS-${testname} PROPERTIES
+            WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+            DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects
         )
-        set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-        set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects)
         add_test (
             NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP
             COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
                 -D "TEST_ARGS:STRING=-d;${testdset};-p;out-${testname}.${testfile}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -559,8 +554,10 @@
                 -D "TEST_REFERENCE=${testfile}-${testname}-v.ddl"
                 -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
         )
-        set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-        set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname})
+        set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES
+            WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+            DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname}
+        )
       endif ()
     endif ()
   endmacro ()
@@ -570,23 +567,22 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5REPACK_VERIFY_SUPERBLOCK-${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_SUPERBLOCK-${testname}-clear-objects PROPERTIES
+          FIXTURES_REQUIRED clear_h5repack
       )
-      if (last_test)
-        set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
       add_test (
           NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}
-          COMMAND $<TARGET_FILE:h5repack${tgt_ext}> -j;${lowbound};-k;${highbound} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> -j;${lowbound};-k;${highbound} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+      )
+      set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname} PROPERTIES
+          DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects
       )
-      set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects)
       add_test (
           NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>"
               -D "TEST_ARGS:STRING=-H;-B;out-${testname}.${testfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -596,28 +592,27 @@
               -D "TEST_REFERENCE=SUPERBLOCK_VERSION ${superblock}"
               -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
       )
-      set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname})
+      set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP PROPERTIES
+          DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname}
+      )
     endif ()
   endmacro ()
 
   macro (ADD_H5_VERIFY_INVALIDBOUNDS testname resultcode lowbound highbound)
       add_test (
           NAME ADD_H5_VERIFY_INVALIDBOUNDS-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 (ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects PROPERTIES
+          FIXTURES_REQUIRED clear_h5repack
       )
-      if (last_test)
-        set_tests_properties (ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
       add_test (
           NAME ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}
-          COMMAND $<TARGET_FILE:h5repack${tgt_ext}> -j;${lowbound};-k;${highbound} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_ext}> -j;${lowbound};-k;${highbound} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
       )
-      set_tests_properties (
-          ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname} PROPERTIES
-              DEPENDS ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects
-              WILL_FAIL "true"
+      set_tests_properties (ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname} PROPERTIES
+          DEPENDS ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects
+          WILL_FAIL "true"
       )
   endmacro ()
 
@@ -625,28 +620,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${tgt_ext}> ${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${tgt_ext}> ${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)
@@ -654,20 +654,15 @@
       # 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_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"
@@ -680,10 +675,13 @@
               -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_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"
@@ -695,7 +693,9 @@
               -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 ()
 
@@ -739,67 +739,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
@@ -908,15 +847,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")
@@ -931,7 +870,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")
 
diff --git a/tools/test/h5repack/CMakeVFDTests.cmake b/tools/test/h5repack/CMakeVFDTests.cmake
index e100e3c..f88f147 100644
--- a/tools/test/h5repack/CMakeVFDTests.cmake
+++ b/tools/test/h5repack/CMakeVFDTests.cmake
@@ -39,6 +39,7 @@
     add_test (
       NAME H5REPACK-VFD-${vfdname}-h5repacktest
       COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
           -D "TEST_PROGRAM=$<TARGET_FILE:h5repacktest>"
           -D "TEST_ARGS:STRING="
           -D "TEST_VFD:STRING=${vfdname}"
@@ -47,10 +48,6 @@
           -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
           -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
     )
-    if (last_test)
-      set_tests_properties (H5REPACK-VFD-${vfdname}-h5repacktest PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "H5REPACK-VFD-${vfdname}-h5repacktest")
   endmacro ()
 
 ##############################################################################
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index 0ae570b..a89bf10 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -2907,10 +2907,10 @@ out:
 static
 int make_all_filters(hid_t loc_id)
 {
-    hid_t    dcpl; /* dataset creation property list */
-    hid_t    sid;  /* dataspace ID */
-    hid_t    dtid;
-    hid_t    dsid;
+    hid_t    dcpl = H5I_INVALID_HID; /* dataset creation property list */
+    hid_t    sid = H5I_INVALID_HID;  /* dataspace ID */
+    hid_t    dtid = H5I_INVALID_HID;
+    hid_t    dsid = H5I_INVALID_HID;
 #if defined (H5_HAVE_FILTER_SZIP)
     unsigned szip_options_mask=H5_SZIP_ALLOW_K13_OPTION_MASK|H5_SZIP_NN_OPTION_MASK;
     unsigned szip_pixels_per_block=8;
@@ -3083,7 +3083,7 @@ int make_early(void)
     hid_t   tid=-1;
     hid_t   dcpl=-1;
     int     i;
-    char    name[10];
+    char    name[16];
     int     iter=100;
 
     if ((fid = H5Fcreate(FNAME5, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -3178,7 +3178,7 @@ int make_layout(hid_t loc_id)
     hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
     int      buf[DIM1][DIM2];
     int      i, j, n;
-    char     name[6];
+    char     name[16];
 
 
     for (i=n=0; i<DIM1; i++)
diff --git a/tools/test/h5stat/CMakeLists.txt b/tools/test/h5stat/CMakeLists.txt
index f3bd20b..5c17fd5 100644
--- a/tools/test/h5stat/CMakeLists.txt
+++ b/tools/test/h5stat/CMakeLists.txt
@@ -11,7 +11,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   target_link_libraries (h5stat_gentest PRIVATE ${HDF5_LIB_TARGET})
   set_target_properties (h5stat_gentest PROPERTIES FOLDER generator/tools)
 
-  #add_test (NAME h5stat_gentest COMMAND $<TARGET_FILE:h5stat_gentest>)
+  #add_test (NAME h5stat_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5stat_gentest>)
 endif ()
 
 include (CMakeTests.cmake)
diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake
index 63886d0..9674a77 100644
--- a/tools/test/h5stat/CMakeTests.cmake
+++ b/tools/test/h5stat/CMakeTests.cmake
@@ -102,27 +102,15 @@
   macro (ADD_H5_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5STAT-${resultfile} COMMAND $<TARGET_FILE:h5stat${tgt_ext}> ${ARGN})
+      add_test (NAME H5STAT-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5stat${tgt_ext}> ${ARGN})
       if (${resultcode})
         set_tests_properties (H5STAT-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
-      if (last_test)
-        set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
     else (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
-          NAME H5STAT-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      if (last_test)
-        set_tests_properties (H5STAT-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
-      add_test (
           NAME H5STAT-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5stat${tgt_ext}>"
               -D "TEST_ARGS=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -131,34 +119,21 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS H5STAT-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
   macro (ADD_H5_ERR_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5STAT-${resultfile} COMMAND $<TARGET_FILE:h5stat${tgt_ext}> ${ARGN})
+      add_test (NAME H5STAT-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5stat${tgt_ext}> ${ARGN})
       if (${resultcode})
         set_tests_properties (H5STAT-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
-      if (last_test)
-        set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
     else (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
-          NAME H5STAT-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-              ${resultfile}.out
-              ${resultfile}.out.err
-      )
-      if (last_test)
-        set_tests_properties (H5STAT-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
-      add_test (
           NAME H5STAT-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5stat${tgt_ext}>"
               -D "TEST_ARGS=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
@@ -168,7 +143,6 @@
               -D "TEST_ERRREF=${resultfile}.err"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS H5STAT-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
@@ -185,13 +159,8 @@
     endforeach ()
     add_test (
       NAME H5STAT-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove ${CLEAR_LIST}
+      COMMAND ${CMAKE_COMMAND} -E remove ${CLEAR_LIST}
     )
-    if (last_test)
-      set_tests_properties (H5STAT-clearall-objects PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "H5STAT-clearall-objects")
   endif ()
 
 # Test for help flag
diff --git a/tools/test/misc/CMakeLists.txt b/tools/test/misc/CMakeLists.txt
index f5e3ea3..a250222 100644
--- a/tools/test/misc/CMakeLists.txt
+++ b/tools/test/misc/CMakeLists.txt
@@ -15,7 +15,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
     target_link_libraries (h5repart_gentest PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET})
   endif ()
   set_target_properties (h5repart_gentest PROPERTIES FOLDER generator/tools)
-  #add_test (NAME h5repart_gentest COMMAND $<TARGET_FILE:h5repart_gentest>)
+  #add_test (NAME h5repart_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart_gentest>)
 
   add_executable (h5clear_gentest ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/h5clear_gentest.c)
   target_include_directories (h5clear_gentest PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
@@ -27,7 +27,7 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
     target_link_libraries (h5clear_gentest PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET})
   endif ()
   set_target_properties (h5clear_gentest PROPERTIES FOLDER tools)
-  #add_test (NAME H5CLEAR-h5clear_gentest COMMAND $<TARGET_FILE:h5clear_gentest>)
+  #add_test (NAME H5CLEAR-h5clear_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear_gentest>)
 
   add_subdirectory (vds)
 
diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake
index c7b2fe9..a2c494d 100644
--- a/tools/test/misc/CMakeTestsClear.cmake
+++ b/tools/test/misc/CMakeTestsClear.cmake
@@ -94,18 +94,9 @@
   macro (ADD_H5_CMP testname resultfile resultcode)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
-          NAME H5CLEAR_CMP-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  testfiles/${testname}.out
-                  testfiles/${testname}.out.err
-      )
-      if (last_test)
-        set_tests_properties (H5CLEAR_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
-      add_test (
           NAME H5CLEAR_CMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -114,26 +105,15 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
-      set (last_test "H5CLEAR_CMP-${testname}")
     endif ()
   endmacro ()
 
   macro (ADD_H5_ERR_CMP testname resultfile resultcode)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
-          NAME H5CLEAR_CMP-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  testfiles/${testname}.out
-                  testfiles/${testname}.out.err
-      )
-      if (last_test)
-        set_tests_properties (H5CLEAR_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
-      add_test (
           NAME H5CLEAR_CMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -143,8 +123,6 @@
               -D "TEST_ERRREF=${resultfile}.err"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
-      set (last_test "H5CLEAR_CMP-${testname}")
     endif ()
   endmacro ()
 
@@ -152,25 +130,20 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5CLEAR_CMP-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  testfiles/${testname}.out
-                  testfiles/${testname}.out.err
-                  testfiles/${testfile}
-      )
-      if (last_test)
-        set_tests_properties (H5CLEAR_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testfile}
+      )
       add_test (
           NAME H5CLEAR_CMP-copy_${testname}
-          COMMAND    ${CMAKE_COMMAND}
-              -E copy_if_different
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different
               "${PROJECT_SOURCE_DIR}/testfiles/${testfile}" "${PROJECT_BINARY_DIR}/testfiles/${testfile}"
       )
-      set_tests_properties (H5CLEAR_CMP-copy_${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
+      set_tests_properties (H5CLEAR_CMP-copy_${testname} PROPERTIES
+          DEPENDS H5CLEAR_CMP-${testname}-clear-objects
+      )
       add_test (
           NAME H5CLEAR_CMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN};${testfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -179,8 +152,9 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-copy_${testname})
-      set (last_test "H5CLEAR_CMP-${testname}")
+      set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES
+          DEPENDS H5CLEAR_CMP-copy_${testname}
+      )
     endif ()
   endmacro ()
 
@@ -188,25 +162,20 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5CLEAR_CMP-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  testfiles/${testname}.out
-                  testfiles/${testname}.out.err
-                  testfiles/${testfile}
-      )
-      if (last_test)
-        set_tests_properties (H5CLEAR_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testfile}
+      )
       add_test (
           NAME H5CLEAR_CMP-copy_${testname}
-          COMMAND    ${CMAKE_COMMAND}
-              -E copy_if_different
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different
               "${PROJECT_SOURCE_DIR}/testfiles/${testfile}" "${PROJECT_BINARY_DIR}/testfiles/${testfile}"
       )
-      set_tests_properties (H5CLEAR_CMP-copy_${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
+      set_tests_properties (H5CLEAR_CMP-copy_${testname} PROPERTIES
+          DEPENDS H5CLEAR_CMP-${testname}-clear-objects
+      )
       add_test (
           NAME H5CLEAR_CMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN};${testfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -216,8 +185,9 @@
               -D "TEST_ERRREF=${resultfile}.err"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-copy_${testname})
-      set (last_test "H5CLEAR_CMP-${testname}")
+      set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES
+          DEPENDS H5CLEAR_CMP-copy_${testname}
+      )
     endif ()
   endmacro ()
 
@@ -225,14 +195,12 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5CLEAR_RET-${testname}
-          COMMAND $<TARGET_FILE:h5clear${tgt_ext}> ${ARGN}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> ${ARGN}
+      )
+      set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+          WILL_FAIL "${resultcode}"
       )
-      set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES WILL_FAIL "${resultcode}")
-      if (last_test)
-        set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES DEPENDS ${last_test})
-      endif ()
-      set (last_test "H5CLEAR_RET-${testname}")
     endif ()
   endmacro ()
 
@@ -240,27 +208,20 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5CLEAR_FILESIZE_TEST-${testname}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  testfiles/${testname}_before_size.out
-                  testfiles/${testname}_before_size.out.err
-                  testfiles/${testname}_after_size.out
-                  testfiles/${testname}_after_size.out.err
-                  testfiles/${testname}.h5
-      )
-      if (last_test)
-        set_tests_properties (H5CLEAR_FILESIZE_TEST-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
-      endif ()
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}.h5
+      )
       add_test (
           NAME H5CLEAR_FILESIZE_TEST-copy_${testname}
-          COMMAND    ${CMAKE_COMMAND}
-              -E copy_if_different
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different
               "${PROJECT_SOURCE_DIR}/testfiles/${testname}.h5" "${PROJECT_BINARY_DIR}/testfiles/${testname}.h5"
       )
-      set_tests_properties (H5CLEAR_FILESIZE_TEST-copy_${testname} PROPERTIES DEPENDS H5CLEAR_FILESIZE_TEST-${testname}-clear-objects)
+      set_tests_properties (H5CLEAR_FILESIZE_TEST-copy_${testname} PROPERTIES
+          DEPENDS H5CLEAR_FILESIZE_TEST-${testname}-clear-objects
+      )
       add_test (
           NAME H5CLEAR_FILESIZE_CMP-${testname}_before_size
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
               -D "TEST_ARGS:STRING=--filesize;${testname}.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -269,34 +230,102 @@
               -D "TEST_REFERENCE=${resultfile}_before_size.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_before_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_TEST-copy_${testname})
+      set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_before_size PROPERTIES
+          DEPENDS H5CLEAR_FILESIZE_TEST-copy_${testname}
+      )
       if (NOT ${incr_size} MATCHES "NONE")
           add_test (
               NAME H5CLEAR_FILESIZE_INCR-${testname}
-              COMMAND $<TARGET_FILE:h5clear${tgt_ext}> --increment=${incr_size} ${testname}.h5
+              COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> --increment=${incr_size} ${testname}.h5
           )
       else ()
           add_test (
               NAME H5CLEAR_FILESIZE_INCR-${testname}
-              COMMAND $<TARGET_FILE:h5clear${tgt_ext}> --increment ${testname}.h5
+              COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> --increment ${testname}.h5
           )
       endif ()
-      set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES WILL_FAIL "${resultcode}")
-      set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES DEPENDS H5CLEAR_FILESIZE_CMP-${testname}_before_size)
+      set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+          WILL_FAIL "${resultcode}"
+          DEPENDS H5CLEAR_FILESIZE_CMP-${testname}_before_size
+      )
       add_test (
           NAME H5CLEAR_FILESIZE_CMP-${testname}_after_size
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
               -D "TEST_ARGS:STRING=--filesize;${testname}.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_OUTPUT=${testname}_after_size.out"
+              -D "TEST_EXPECT=0"
+              -D "TEST_REFERENCE=${resultfile}_after_size.ddl"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_after_size PROPERTIES
+          DEPENDS H5CLEAR_FILESIZE_INCR-${testname}
+      )
+    endif ()
+  endmacro ()
+
+  macro (ADD_H5_FILESIZE_FAIL_TEST testname resultcode resultfile incr_size)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5CLEAR_FILESIZE_FAIL_TEST-${testname}-clear-objects
+          COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}.h5
+      )
+      add_test (
+          NAME H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname}
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different
+              "${PROJECT_SOURCE_DIR}/testfiles/${testname}.h5" "${PROJECT_BINARY_DIR}/testfiles/${testname}.h5"
+      )
+      set_tests_properties (H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname} PROPERTIES
+          DEPENDS H5CLEAR_FILESIZE_FAIL_TEST-${testname}-clear-objects
+      )
+      add_test (
+          NAME H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
+              -D "TEST_ARGS:STRING=--filesize;${testname}.h5"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=${testname}_before_size.out"
               -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=${resultfile}.mty"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size PROPERTIES
+          DEPENDS H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname}
+      )
+      if (NOT ${incr_size} MATCHES "NONE")
+          add_test (
+              NAME H5CLEAR_FILESIZE_FAIL_INCR-${testname}
+              COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> -s --increment=${incr_size} ${testname}.h5
+          )
+      else ()
+          add_test (
+              NAME H5CLEAR_FILESIZE_FAIL_INCR-${testname}
+              COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> -s --increment ${testname}.h5
+          )
+      endif ()
+      set_tests_properties (H5CLEAR_FILESIZE_FAIL_INCR-${testname} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+          DEPENDS H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size
+      )
+      add_test (
+          NAME H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5clear${tgt_ext}>"
+              -D "TEST_ARGS:STRING=--filesize;${testname}.h5"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=${testname}_after_size.out"
+              -D "TEST_EXPECT=0"
               -D "TEST_REFERENCE=${resultfile}_after_size.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_after_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_INCR-${testname})
-      set (last_test "H5CLEAR_FILESIZE_CMP-${testname}_after_size")
+      set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size PROPERTIES
+          DEPENDS H5CLEAR_FILESIZE_FAIL_INCR-${testname}
+      )
     endif ()
   endmacro ()
 
@@ -304,32 +333,39 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5CLEAR-clr_open_chk-copy_${testname}.h5
-          COMMAND    ${CMAKE_COMMAND}
-              -E copy_if_different
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different
               "${PROJECT_SOURCE_DIR}/testfiles/${testfile}.h5" "${PROJECT_BINARY_DIR}/testfiles/${testfile}.h5"
       )
-      if (last_test)
-        set_tests_properties (H5CLEAR-clr_open_chk-copy_${testname}.h5 PROPERTIES DEPENDS ${last_test})
-      endif ()
-      set (last_test "H5CLEAR-clr_open_chk-copy_${testname}.h5")
 
       # Initial file open fails OR
       # File open succeeds because the library does not check status_flags for file with < v3 superblock
-      add_test (NAME H5CLEAR-clr_open_chk-${testname}_${resultcode} COMMAND $<TARGET_FILE:clear_open_chk> ${testfile}.h5)
-      set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES WILL_FAIL "${resultcode}")
-      set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      if (last_test)
-        set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES DEPENDS ${last_test})
-      endif ()
+      add_test (
+          NAME H5CLEAR-clr_open_chk-${testname}_${resultcode}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:clear_open_chk> ${testfile}.h5
+      )
+      set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES
+          WILL_FAIL "${resultcode}"
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+          DEPENDS H5CLEAR-clr_open_chk-copy_${testname}.h5
+      )
 
       # After "h5clear" the file, the subsequent file open succeeds
-      add_test (NAME H5CLEAR-h5clr-${testname} COMMAND $<TARGET_FILE:h5clear${tgt_ext}> -s ${testfile}.h5)
-      set_tests_properties (H5CLEAR-h5clr-${testname} PROPERTIES DEPENDS H5CLEAR-clr_open_chk-${testname}_${resultcode})
-      set_tests_properties (H5CLEAR-h5clr-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      add_test (NAME H5CLEAR-clr_open_chk-${testname} COMMAND $<TARGET_FILE:clear_open_chk> ${testfile}.h5)
-      set_tests_properties (H5CLEAR-clr_open_chk-${testname} PROPERTIES DEPENDS H5CLEAR-h5clr-${testname})
-      set_tests_properties (H5CLEAR-clr_open_chk-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      set (last_test "H5CLEAR-clr_open_chk-${testname}")
+      add_test (
+          NAME H5CLEAR-h5clr-${testname}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear${tgt_ext}> -s ${testfile}.h5
+      )
+      set_tests_properties (H5CLEAR-h5clr-${testname} PROPERTIES
+          DEPENDS H5CLEAR-clr_open_chk-${testname}_${resultcode}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+      )
+      add_test (
+          NAME H5CLEAR-clr_open_chk-${testname}
+          COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:clear_open_chk> ${testfile}.h5
+      )
+      set_tests_properties (H5CLEAR-clr_open_chk-${testname} PROPERTIES
+          DEPENDS H5CLEAR-h5clr-${testname}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+      )
     endif ()
   endmacro ()
 
@@ -341,73 +377,6 @@
 #
 #
 #
-# The following are tests to verify the status_flags field is cleared properly:
-if (HDF5_ENABLE_USING_MEMCHECKER)
-  # Remove any output file left over from previous test run
-  add_test (
-    NAME H5CLEAR-clearall-objects
-    COMMAND    ${CMAKE_COMMAND}
-        -E remove
-        h5clear_log_v3.h5
-        h5clear_mdc_image.h5
-        h5clear_sec2_v0.h5
-        h5clear_sec2_v2.h5
-        h5clear_sec2_v3.h5
-        orig_h5clear_sec2_v0.h5
-        orig_h5clear_sec2_v2.h5
-        orig_h5clear_sec2_v3.h5
-        latest_h5clear_log_v3.h5
-        latest_h5clear_sec2_v3.h5
-        mod_h5clear_mdc_image.h5
-        mod_h5clear_mdc_image2.h5
-        ${HDF5_TEST_FILES}
-  )
-  if (last_test)
-    set_tests_properties (H5CLEAR-clearall-objects PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "H5CLEAR-clearall-objects")
-
-  foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES})
-    add_test (
-      NAME H5CLEAR-copy_${h5_file}
-      COMMAND    ${CMAKE_COMMAND}
-          -E copy_if_different
-          "${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}"
-    )
-    if (last_test)
-      set_tests_properties (H5CLEAR-copy_${h5_file} PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "H5CLEAR-copy_${h5_file}")
-  endforeach ()
-  # make second copy of h5clear_sec2.h5
-  foreach (h5_file ${HDF5_SEC2_TEST_FILES})
-    add_test (
-      NAME H5CLEAR-copy_orig_${h5_file}
-      COMMAND    ${CMAKE_COMMAND}
-          -E copy_if_different
-          "${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/orig_${h5_file}"
-    )
-    if (last_test)
-      set_tests_properties (H5CLEAR-copy_orig_${h5_file} PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "H5CLEAR-copy_orig_${h5_file}")
-  endforeach ()
-  # make second copy of mod_h5clear_mdc_image.h5
-  add_test (
-      NAME H5CLEAR-copy_mod_h5clr_mdc_image2.h5
-      COMMAND    ${CMAKE_COMMAND}
-          -E copy_if_different
-          "${PROJECT_SOURCE_DIR}/testfiles/mod_h5clear_mdc_image.h5" "${PROJECT_BINARY_DIR}/testfiles/mod_h5clear_mdc_image2.h5"
-  )
-  if (last_test)
-    set_tests_properties (H5CLEAR-copy_mod_h5clr_mdc_image2.h5 PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "H5CLEAR-copy_mod_h5clr_mdc_image2.h5")
-endif()
-
-#
-#
-#
 # The following are tests to verify the expected output from h5clear
 # "h5clear -h"
 # "h5clear"                                 (no options, no file)
@@ -481,9 +450,7 @@ endif()
 # "h5clear -s --increment=0 h5clear_status_noclose.h5"  (clear status_flag, EOA = MAX(EOA, EOF) + 0)
 #                                                       (no output, check exit code)
 # "h5clear --filesize h5clear_status_noclose.h5"        (print EOA/EOF after the last action)
-  ADD_H5_ERR_CMP_WITH_COPY (h5clr_open_fail_nc_s 1 h5clear_open_fail h5clear_status_noclose.h5 "--filesize")
-  ADD_H5_RETTEST (h5clr_mdc_image_nc "false" "-s" "--increment=0" h5clear_status_noclose.h5)
-  ADD_H5_CMP (h5clr_no_mdc_image_nc_m h5clear_status_noclose_after_size 0 "--filesize" h5clear_status_noclose.h5)
+  ADD_H5_FILESIZE_FAIL_TEST (h5clear_status_noclose 1 h5clear_status_noclose 0)
 #
 # (2) h5clear_fsm_persist_noclose.h5
 # "h5clear --filesize h5clear_fsm_persist_noclose.h5"       (print EOA/EOF before the next action)
diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake
index db1f805..11fa3f2 100644
--- a/tools/test/misc/CMakeTestsMkgrp.cmake
+++ b/tools/test/misc/CMakeTestsMkgrp.cmake
@@ -61,32 +61,26 @@
   endif ()
 
   macro (ADD_H5_TEST resultfile resultcode resultoption)
-    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (
-          NAME H5MKGRP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  ${resultfile}.h5
-                  ${resultfile}.out
-                  ${resultfile}.out.err
-      )
-      set_tests_properties (H5MKGRP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-    endif ()
-
+    add_test (
+        NAME H5MKGRP-${resultfile}-clear-objects
+        COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.h5
+    )
+    set_tests_properties (H5MKGRP-${resultfile}-clear-objects PROPERTIES
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+    )
     add_test (
         NAME H5MKGRP-${resultfile}
-        COMMAND $<TARGET_FILE:h5mkgrp${tgt_ext}> ${resultoption} ${resultfile}.h5 ${ARGN}
+        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5mkgrp${tgt_ext}> ${resultoption} ${resultfile}.h5 ${ARGN}
     )
-    set_tests_properties (H5MKGRP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      if (last_test)
-        set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
-    else ()
-      set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DEPENDS H5MKGRP-${resultfile}-clear-objects)
+    set_tests_properties (H5MKGRP-${resultfile} PROPERTIES
+        DEPENDS H5MKGRP-${resultfile}-clear-objects
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
+    )
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5MKGRP-${resultfile}-h5ls
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5ls${tgt_ext}>"
               -D "TEST_ARGS:STRING=-v;-r;${resultfile}.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -102,20 +96,19 @@
 
   macro (ADD_H5_CMP resultfile resultcode)
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5MKGRP_CMP-${resultfile} COMMAND $<TARGET_FILE:h5mkgrp> ${ARGN})
+      add_test (NAME H5MKGRP_CMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5mkgrp> ${ARGN})
     else ()
       add_test (
           NAME H5MKGRP_CMP-${resultfile}-clear-objects
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove
-                  ${resultfile}.h5
-                  ${resultfile}.out
-                  ${resultfile}.out.err
+          COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.h5
+      )
+      set_tests_properties (H5MKGRP_CMP-${resultfile}-clear-objects PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
       )
-      set_tests_properties (H5MKGRP_CMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
       add_test (
           NAME H5MKGRP_CMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5mkgrp${tgt_ext}>"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
@@ -124,7 +117,9 @@
               -D "TEST_REFERENCE=${resultfile}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5MKGRP_CMP-${resultfile} PROPERTIES DEPENDS H5MKGRP_CMP-${resultfile}-clear-objects)
+      set_tests_properties (H5MKGRP_CMP-${resultfile} PROPERTIES
+          DEPENDS H5MKGRP_CMP-${resultfile}-clear-objects
+      )
     endif ()
   endmacro ()
 
@@ -136,54 +131,23 @@
   if (HDF5_ENABLE_USING_MEMCHECKER)
     add_test (
         NAME H5MKGRP-clearall-objects
-        COMMAND    ${CMAKE_COMMAND}
-            -E remove
-                h5mkgrp_help.out
-                h5mkgrp_help.out.err
-                h5mkgrp_version.out
-                h5mkgrp_version.out.err
-                h5mkgrp_single.h5
-                h5mkgrp_single.out
-                h5mkgrp_single.out.err
-                h5mkgrp_single_v.h5
-                h5mkgrp_single_v.out
-                h5mkgrp_single_v.out.err
-                h5mkgrp_single_p.h5
-                h5mkgrp_single_p.out
-                h5mkgrp_single_p.out.err
-                h5mkgrp_single_l.h5
-                h5mkgrp_single_l.out
-                h5mkgrp_single_l.out.err
-                h5mkgrp_several.h5
-                h5mkgrp_several.out
-                h5mkgrp_several.out.err
-                h5mkgrp_several_v.h5
-                h5mkgrp_several_v.out
-                h5mkgrp_several_v.out.err
-                h5mkgrp_several_p.h5
-                h5mkgrp_several_p.out
-                h5mkgrp_several_p.out.err
-                h5mkgrp_several_l.h5
-                h5mkgrp_several_l.out
-                h5mkgrp_several_l.out.err
-                h5mkgrp_nested_p.h5
-                h5mkgrp_nested_p.out
-                h5mkgrp_nested_p.out.err
-                h5mkgrp_nested_lp.h5
-                h5mkgrp_nested_lp.out
-                h5mkgrp_nested_lp.out.err
-                h5mkgrp_nested_mult_p.h5
-                h5mkgrp_nested_mult_p.out
-                h5mkgrp_nested_mult_p.out.err
-                h5mkgrp_nested_mult_lp.h5
-                h5mkgrp_nested_mult_lp.out
-                h5mkgrp_nested_mult_lp.out.err
+        COMMAND ${CMAKE_COMMAND} -E remove
+            h5mkgrp_single.h5
+            h5mkgrp_single_v.h5
+            h5mkgrp_single_p.h5
+            h5mkgrp_single_l.h5
+            h5mkgrp_several.h5
+            h5mkgrp_several_v.h5
+            h5mkgrp_several_p.h5
+            h5mkgrp_several_l.h5
+            h5mkgrp_nested_p.h5
+            h5mkgrp_nested_lp.h5
+            h5mkgrp_nested_mult_p.h5
+            h5mkgrp_nested_mult_lp.h5
+    )
+    set_tests_properties (H5MKGRP-clearall-objects PROPERTIES
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles"
     )
-    set_tests_properties (H5MKGRP-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-    if (last_test)
-      set_tests_properties (H5MKGRP-clearall-objects PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "H5MKGRP-clearall-objects")
   endif ()
 
   # Check that help & version is displayed properly
diff --git a/tools/test/misc/CMakeTestsRepart.cmake b/tools/test/misc/CMakeTestsRepart.cmake
index 53949a2..fa49c53 100644
--- a/tools/test/misc/CMakeTestsRepart.cmake
+++ b/tools/test/misc/CMakeTestsRepart.cmake
@@ -80,31 +80,46 @@
   set_tests_properties (H5REPART-clearall-objects PROPERTIES FIXTURES_SETUP clear_testrepart)
 
   # repartition family member size to 20,000 bytes.
-  add_test (NAME H5REPART-h5repart_20K COMMAND $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 family_file%05d.h5 fst_family%05d.h5)
+  add_test (
+      NAME H5REPART-h5repart_20K
+      COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 family_file%05d.h5 fst_family%05d.h5
+  )
   set_tests_properties (H5REPART-h5repart_20K PROPERTIES
       FIXTURES_REQUIRED clear_testrepart
   )
 
   # repartition family member size to 5 KB.
-  add_test (NAME H5REPART-h5repart_5K COMMAND $<TARGET_FILE:h5repart${tgt_ext}> -m 5k family_file%05d.h5 scd_family%05d.h5)
+  add_test (
+      NAME H5REPART-h5repart_5K
+      COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 5k family_file%05d.h5 scd_family%05d.h5
+  )
   set_tests_properties (H5REPART-h5repart_5K PROPERTIES
       FIXTURES_REQUIRED clear_testrepart
   )
 
   # convert family file to sec2 file of 20,000 bytes
-  add_test (NAME H5REPART-h5repart_single COMMAND $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 -family_to_single family_file%05d.h5 family_to_single.h5)
+  add_test (
+      NAME H5REPART-h5repart_single
+      COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 -family_to_single family_file%05d.h5 family_to_single.h5
+  )
   set_tests_properties (H5REPART-h5repart_single PROPERTIES
       FIXTURES_REQUIRED clear_testrepart
   )
 
   # convert family file to sec2 file of 20,000 bytes (old argument)
-  add_test (NAME H5REPART-h5repart_sec2 COMMAND $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5)
+  add_test (
+      NAME H5REPART-h5repart_sec2
+      COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart${tgt_ext}> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5
+  )
   set_tests_properties (H5REPART-h5repart_sec2 PROPERTIES
       FIXTURES_REQUIRED clear_testrepart
   )
 
   # test the output files repartitioned above.
-  add_test (NAME H5REPART-h5repart_test COMMAND $<TARGET_FILE:h5repart_test>)
+  add_test (
+      NAME H5REPART-h5repart_test
+      COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart_test>
+  )
   set_tests_properties (H5REPART-h5repart_test PROPERTIES
       DEPENDS "H5REPART-h5repart_20K;H5REPART-h5repart_5K;H5REPART-h5repart_single;H5REPART-h5repart_sec2"
   )
diff --git a/tools/test/perform/CMakeLists.txt b/tools/test/perform/CMakeLists.txt
index 77b154a..d6a25d5 100644
--- a/tools/test/perform/CMakeLists.txt
+++ b/tools/test/perform/CMakeLists.txt
@@ -118,6 +118,23 @@ endif ()
 set_target_properties (zip_perf PROPERTIES FOLDER perform)
 
 if (H5_HAVE_PARALLEL AND BUILD_TESTING)
+  if (UNIX)
+      #-- Adding test for perf - only on unix systems
+      set (perf_SOURCES
+          ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/perf.c
+      )
+      add_executable (perf ${perf_SOURCES})
+      target_include_directories (perf PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+      if (NOT BUILD_SHARED_LIBS)
+        TARGET_C_PROPERTIES (perf STATIC)
+        target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
+      else ()
+        TARGET_C_PROPERTIES (perf SHARED)
+        target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+      endif ()
+      set_target_properties (perf PROPERTIES FOLDER perform)
+  endif ()
+
   #-- Adding test for h5perf
   set (h5perf_SOURCES
       ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_perf.c
diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake
index 36172d1..f0ae416 100644
--- a/tools/test/perform/CMakeTests.cmake
+++ b/tools/test/perform/CMakeTests.cmake
@@ -53,9 +53,10 @@ add_test (
 )
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>)
+  add_test (NAME PERFORM_h5perf_serial COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial>)
 else ()
   add_test (NAME PERFORM_h5perf_serial COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:h5perf_serial>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -66,17 +67,20 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_h5perf_serial PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
-set_tests_properties (PERFORM_h5perf_serial PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_h5perf_serial PROPERTIES
+    TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_BUILD_PERFORM_STANDALONE)
-  add_test (NAME PERFORM_h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>)
+  add_test (NAME PERFORM_h5perf_serial_alone COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial_alone>)
 endif ()
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_chunk COMMAND $<TARGET_FILE:chunk>)
+  add_test (NAME PERFORM_chunk COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:chunk>)
 else ()
   add_test (NAME PERFORM_chunk COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:chunk>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -87,12 +91,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_chunk PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_chunk PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_iopipe COMMAND $<TARGET_FILE:iopipe>)
+  add_test (NAME PERFORM_iopipe COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:iopipe>)
 else ()
   add_test (NAME PERFORM_iopipe COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:iopipe>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -103,12 +110,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_iopipe PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_iopipe PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_overhead COMMAND $<TARGET_FILE:overhead>)
+  add_test (NAME PERFORM_overhead COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:overhead>)
 else ()
   add_test (NAME PERFORM_overhead COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:overhead>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -119,12 +129,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_overhead PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_overhead PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_perf_meta COMMAND $<TARGET_FILE:perf_meta>)
+  add_test (NAME PERFORM_perf_meta COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:perf_meta>)
 else ()
   add_test (NAME PERFORM_perf_meta COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:perf_meta>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -135,12 +148,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_perf_meta PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_perf_meta PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_zip_perf_help COMMAND $<TARGET_FILE:zip_perf> "-h")
+  add_test (NAME PERFORM_zip_perf_help COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> "-h")
 else ()
   add_test (NAME PERFORM_zip_perf_help COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -151,12 +167,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_zip_perf_help PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_zip_perf_help PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_zip_perf COMMAND $<TARGET_FILE:zip_perf> tfilters.h5)
+  add_test (NAME PERFORM_zip_perf COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> tfilters.h5)
 else ()
   add_test (NAME PERFORM_zip_perf COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -167,9 +186,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_zip_perf PROPERTIES
+    DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects"
+)
 
 if (H5_HAVE_PARALLEL)
+  if (UNIX)
+    add_test (NAME MPI_TEST_PERFORM_perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:perf> ${MPIEXEC_POSTFLAGS})
+  endif ()
+
   add_test (NAME MPI_TEST_PERFORM_h5perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:h5perf> ${MPIEXEC_POSTFLAGS})
 
   if (HDF5_BUILD_PERFORM_STANDALONE)
diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c
index c6e62d5..1d52471 100644
--- a/tools/test/perform/perf.c
+++ b/tools/test/perform/perf.c
@@ -22,6 +22,7 @@
 
 #include "hdf5.h"
 #include "H5private.h"
+#include "h5test.h"
 
 #ifdef H5_HAVE_PARALLEL
 
@@ -77,7 +78,7 @@
 
 hsize_t dims[RANK];     /* dataset dim sizes */
 hsize_t block[RANK], stride[RANK], count[RANK];
-hssize_t start[RANK];
+hsize_t start[RANK];
 hid_t fid;                  /* HDF5 file ID */
 hid_t acc_tpl;    /* File access templates */
 hid_t sid;       /* Dataspace ID */
@@ -240,7 +241,7 @@ int main(int argc, char **argv)
      */
     for(j=0; j < opt_iter; j++) {
         /* setup a file dataspace selection */
-        start[0] = (j*iter_jump)+(mynod*opt_block);
+        start[0] = (hsize_t)((j * iter_jump) + (mynod * opt_block));
         stride[0] = block[0] = opt_block;
         count[0]= 1;
         ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
@@ -293,7 +294,7 @@ int main(int argc, char **argv)
     /* we are going to repeat the read the same pattern the write used */
     for (j=0; j < opt_iter; j++) {
         /* setup a file dataspace selection */
-        start[0] = (j*iter_jump)+(mynod*opt_block);
+        start[0] = (hsize_t)((j * iter_jump) + (mynod * opt_block));
         stride[0] = block[0] = opt_block;
         count[0]= 1;
         ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
@@ -320,13 +321,13 @@ int main(int argc, char **argv)
         VRFY((ret >= 0), "H5Dwrite dataset1 succeeded", !H5FATAL);
 
 
-       if (ret < 0) fprintf(stderr, "node %d, read error, loc = %Ld: %s\n",
+       if (ret < 0) HDfprintf(stderr, "node %d, read error, loc = %Ld: %s\n",
                     mynod, mynod*opt_block, strerror(myerrno));
 
         /* if the user wanted to check correctness, compare the write
          * buffer to the read buffer */
         if (opt_correct && memcmp(buf, buf2, opt_block)) {
-                fprintf(stderr, "node %d, correctness test failed\n", mynod);
+                HDfprintf(stderr, "node %d, correctness test failed\n", mynod);
                 my_correct = 0;
                 MPI_Allreduce(&my_correct, &correct, 1, MPI_INT, MPI_MIN,
                         MPI_COMM_WORLD);
@@ -435,10 +436,12 @@ parse_args(int argc, char **argv)
                        * e.g., -a4096/512  allocate at 4096 bytes
                        * boundary if request size >= 512.
                        */
-                {char *p;
-                opt_alignment = atoi(optarg);
-                if (p=(char*)strchr(optarg, '/'))
-                    opt_threshold = atoi(p+1);
+                {
+                    char *p;
+
+                    opt_alignment = HDatoi(optarg);
+                    if(NULL != (p = (char*)HDstrchr(optarg, '/')))
+                        opt_threshold = HDatoi(p + 1);
                 }
                 HDfprintf(stdout,
                     "alignment/threshold=%Hu/%Hu\n",
author	Allen Byrne <byrn@hdfgroup.org>	2019-07-24 16:08:47 (GMT)
committer	Allen Byrne <byrn@hdfgroup.org>	2019-07-24 16:08:47 (GMT)
commit	34adba4a0c131afe49a75e8e7d92f1e986c1b540 (patch)
tree	8e196a9fab1502a45d0d05a190fb1f90ec94dbed /tools/test
parent	ab0b1a00aff3bee4a3cf0d31614368935c435b6f (diff)
download	hdf5-34adba4a0c131afe49a75e8e7d92f1e986c1b540.zip hdf5-34adba4a0c131afe49a75e8e7d92f1e986c1b540.tar.gz hdf5-34adba4a0c131afe49a75e8e7d92f1e986c1b540.tar.bz2