Develop cmake clean (#1971)

5 files changed, 306 insertions, 83 deletions

diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 4fa9a8f..118fac4 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -444,11 +444,6 @@
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_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 ()
       add_test (
           NAME H5DUMP-${testname}
@@ -462,10 +457,10 @@
               -D "TEST_REFERENCE=h5dump-${testname}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      if (last_test)
-        set_tests_properties (H5DUMP-${testname} PROPERTIES DEPENDS ${last_test})
-      endif ()
     endif ()
+    set_tests_properties (H5DUMP-${testname} PROPERTIES
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+    )
   endmacro ()
 
   macro (ADD_SKIP_H5_TEST skipresultfile skipresultcode testtype)
@@ -486,19 +481,13 @@
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_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")
       endif ()
-      if (last_test)
-        set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
-    else ()
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.bin
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
       )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+    else ()
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -511,27 +500,32 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
+    set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+    )
   endmacro ()
 
   macro (ADD_H5_TEST_N resultfile resultcode)
+    add_test (
+        NAME H5DUMP-N-${resultfile}-clear-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${resultfile}-N.bin
+    )
+    set_tests_properties (H5DUMP-N-${resultfile}-clear-objects PROPERTIES
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+    )
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-N-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_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")
       endif ()
-      if (last_test)
-        set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
-    else ()
-      add_test (
-          NAME H5DUMP-N-${resultfile}-clear-objects
-          COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}-N.bin
+      set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-N-${resultfile}-clear-objects
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
       )
-      set_tests_properties (H5DUMP-N-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+    else ()
       add_test (
           NAME H5DUMP-N-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -544,27 +538,41 @@
               -D "TEST_REFERENCE=${resultfile}-N.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES DEPENDS "H5DUMP-N-${resultfile}-clear-objects")
     endif ()
+    set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES
+        DEPENDS H5DUMP-N-${resultfile}-clear-objects
+    )
+    add_test (
+        NAME H5DUMP-N-${resultfile}-clean-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${resultfile}-N.bin
+    )
+    set_tests_properties (H5DUMP-N-${resultfile}-clean-objects PROPERTIES
+        DEPENDS H5DUMP-N-${resultfile}
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+    )
   endmacro ()
 
   macro (ADD_H5_TEST_EXPORT resultfile targetfile resultcode)
+    add_test (
+        NAME H5DUMP-${resultfile}-clear-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${resultfile}.txt
+    )
+    set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+    )
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_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")
       endif ()
-      if (last_test)
-        set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
-    else ()
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.txt
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-${resultfile}-clear-objects
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
       )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+    else ()
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -577,35 +585,58 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-${resultfile}-clear-objects
+      )
       add_test (
           NAME H5DUMP-${resultfile}-output-cmp
           COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_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}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
       set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile})
     endif ()
+    add_test (
+        NAME H5DUMP-${resultfile}-clean-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${resultfile}.txt
+    )
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES
+          DEPENDS H5DUMP-${resultfile}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
+    else ()
+      set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES
+          DEPENDS H5DUMP-${resultfile}-output-cmp
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
+    endif ()
   endmacro ()
 
   macro (ADD_H5_TEST_EXPORT_DDL resultfile targetfile resultcode ddlfile)
+    add_test (
+        NAME H5DUMP-${resultfile}-clear-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${ddlfile}.txt
+            ${resultfile}.txt
+    )
+    set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+    )
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_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")
       endif ()
-      if (last_test)
-        set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
-    else ()
-      add_test (
-          NAME H5DUMP-${resultfile}-clear-objects
-          COMMAND ${CMAKE_COMMAND} -E remove
-              ${ddlfile}.txt
-              ${resultfile}.txt
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-${resultfile}-clear-objects
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
       )
-      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+    else ()
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -618,19 +649,43 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-${resultfile}-clear-objects
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
       add_test (
           NAME H5DUMP-${resultfile}-output-cmp
           COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_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})
+      set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES
+          DEPENDS H5DUMP-${resultfile}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
       add_test (
           NAME H5DUMP-${resultfile}-output-cmp-ddl
           COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_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)
+      set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES
+          DEPENDS H5DUMP-${resultfile}-output-cmp
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
+    endif ()
+    add_test (
+        NAME H5DUMP-${resultfile}-clean-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${ddlfile}.txt
+            ${resultfile}.txt
+    )
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES
+          DEPENDS H5DUMP-${resultfile}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
+    else ()
+      set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES
+          DEPENDS H5DUMP-${resultfile}-output-cmp-ddl
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
     endif ()
   endmacro ()
 
@@ -638,21 +693,37 @@
     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"
       )
-      set_tests_properties (H5DUMP-output-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-output-${resultfile}
           COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_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)
+      set_tests_properties (H5DUMP-output-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-output-${resultfile}-clear-objects
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
       add_test (
           NAME H5DUMP-output-cmp-${resultfile}
           COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_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})
+      set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-output-${resultfile}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
+      add_test (
+          NAME H5DUMP-output-${resultfile}-clean-objects
+          COMMAND ${CMAKE_COMMAND} -E remove
+              ${resultfile}.txt
+      )
+      set_tests_properties (H5DUMP-output-${resultfile}-clean-objects PROPERTIES
+          DEPENDS H5DUMP-output-cmp-${resultfile}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
     endif ()
   endmacro ()
 
@@ -671,6 +742,9 @@
               -D "TEST_MASK_ERROR=true"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
     endif ()
   endmacro ()
 
@@ -688,6 +762,9 @@
               -D "TEST_REFERENCE=${result_check}"
               -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
       )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
     endif ()
   endmacro ()
 
@@ -706,6 +783,9 @@
               -D "TEST_ERRREF=${result_errcheck}"
               -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
       )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
     endif ()
   endmacro ()
 
@@ -726,6 +806,46 @@
               -D "TEST_ENV_VALUE:STRING=${envval}"
               -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
       )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
+    endif ()
+  endmacro ()
+
+  macro (ADD_H5_BIN_EXPORT conffile resultcode testfile)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5DUMP-BIN_EXPORT-${conffile}-clear-objects
+          COMMAND ${CMAKE_COMMAND} -E remove
+              ${conffile}.bin
+      )
+      set_tests_properties (H5DUMP-BIN_EXPORT-${conffile}-clear-objects PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
+      add_test (
+          NAME H5DUMP-BIN_EXPORT-${conffile}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_file_ext}>"
+              -D "TEST_ARGS:STRING=${ARGN};-o;${conffile}.bin;${testfile}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
+              -D "TEST_OUTPUT=${conffile}.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=${conffile}.ddl"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5DUMP-BIN_EXPORT-${conffile} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
+      add_test (
+          NAME H5DUMP-BIN_EXPORT-${conffile}-clean-objects
+          COMMAND ${CMAKE_COMMAND} -E remove
+              ${conffile}.bin
+      )
+      set_tests_properties (H5DUMP-BIN_EXPORT-${conffile}-clean-objects PROPERTIES
+          DEPENDS H5DUMP-BIN_EXPORT-${conffile}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
     endif ()
   endmacro ()
 
@@ -738,7 +858,9 @@
               ${resultfile}.bin
               ${resultfile}.h5
       )
-      set_tests_properties (H5DUMP-IMPORT-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+      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}"
@@ -751,20 +873,37 @@
               -D "TEST_REFERENCE=${conffile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP-IMPORT-${resultfile} PROPERTIES DEPENDS "H5DUMP-IMPORT-${resultfile}-clear-objects")
+      set_tests_properties (H5DUMP-IMPORT-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-IMPORT-${resultfile}-clear-objects
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
       add_test (NAME H5DUMP-IMPORT-h5import-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5import${tgt_file_ext}> ${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})
+      set_tests_properties (H5DUMP-IMPORT-h5import-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-IMPORT-${resultfile}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
       add_test (NAME H5DUMP-IMPORT-h5diff-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> ${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})
+      set_tests_properties (H5DUMP-IMPORT-h5diff-${resultfile} PROPERTIES
+          DEPENDS H5DUMP-IMPORT-h5import-${resultfile}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
+      add_test (
+          NAME H5DUMP-IMPORT-${resultfile}-clean-objects
+          COMMAND ${CMAKE_COMMAND} -E remove
+              ${resultfile}.bin
+              ${resultfile}.h5
+      )
+      set_tests_properties (H5DUMP-IMPORT-${resultfile}-clean-objects PROPERTIES
+          DEPENDS H5DUMP-IMPORT-h5diff-${resultfile}
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
     endif ()
   endmacro ()
 
   macro (ADD_H5_UD_TEST testname resultcode resultfile)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
-          NAME H5DUMP_UD-${testname}
+          NAME H5DUMP_UD-${testname}-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_file_ext}>"
@@ -778,6 +917,9 @@
               -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP_UD-${testname}-${resultfile} PROPERTIES
+          WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std"
+      )
     endif ()
   endmacro ()
 
@@ -1113,7 +1255,7 @@
   ADD_H5_TEST (tvms 0 --enable-error-stack tvms.h5)
 
   # test for binary output
-  ADD_H5_TEST (tbin1LE 0 --enable-error-stack -d integer -o tbin1LE.bin -b LE tbinary.h5)
+  ADD_H5_BIN_EXPORT (tbin1LE 0 tbinary.h5 --enable-error-stack -d integer -b LE)
 
   # test for string binary output
   ADD_H5_EXPORT_TEST (tstr2bin2 tstr2.h5 0 --enable-error-stack -d /g2/dset2 -b -o)
@@ -1123,14 +1265,14 @@
 #  ADD_H5_TEST_IMPORT (tbin1 out1D tbinary.h5 0 --enable-error-stack -d integer -b)
 
   if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-    ADD_H5_TEST (tbin2 0 --enable-error-stack -b BE -d float -o tbin2.bin tbinary.h5)
+    ADD_H5_BIN_EXPORT (tbin2 0 tbinary.h5 --enable-error-stack -b BE -d float)
   endif ()
 
   # the NATIVE test can be validated with h5import/h5diff
 #  ADD_H5_TEST_IMPORT (tbin3 out3D tbinary.h5 0 --enable-error-stack -d integer -b NATIVE)
 
   if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-    ADD_H5_TEST (tbin4 0 --enable-error-stack -d double -b FILE -o tbin4.bin tbinary.h5)
+    ADD_H5_BIN_EXPORT (tbin4 0 tbinary.h5 --enable-error-stack -d double -b FILE)
   endif ()
 
   # test for dataset region references
diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake
index 0c3297f..8bf0940 100644
--- a/tools/test/h5dump/CMakeTestsPBITS.cmake
+++ b/tools/test/h5dump/CMakeTestsPBITS.cmake
@@ -120,16 +120,21 @@
 ##############################################################################
 
   macro (ADD_H5_PBITS_TEST resultfile resultcode)
+    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"
+    )
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_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")
       endif ()
-      if (last_pbits_test)
-        set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_pbits_test})
-      endif ()
     else ()
       add_test (
           NAME H5DUMP-${resultfile}
@@ -144,6 +149,20 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
     endif ()
+    set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+        DEPENDS H5DUMP-${resultfile}-clear-objects
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits"
+    )
+    add_test (
+        NAME H5DUMP-${resultfile}-clean-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${resultfile}.out
+            ${resultfile}.out.err
+    )
+    set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES
+        DEPENDS H5DUMP-${resultfile}
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits"
+    )
   endmacro ()
 
 ##############################################################################
diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake
index 88df9ad..017a9fe 100644
--- a/tools/test/h5dump/CMakeTestsVDS.cmake
+++ b/tools/test/h5dump/CMakeTestsVDS.cmake
@@ -117,15 +117,20 @@
 
   macro (ADD_H5_VDS_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
+    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"
+    )
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_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")
       endif ()
-      if (last_vds_test)
-        set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_VDS_test})
-      endif ()
     else ()
       add_test (
           NAME H5DUMP-${resultfile}
@@ -140,6 +145,20 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
     endif ()
+    set_tests_properties (H5DUMP-${resultfile} PROPERTIES
+        DEPENDS H5DUMP-${resultfile}-clear-objects
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds"
+    )
+    add_test (
+        NAME H5DUMP-${resultfile}-clean-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${resultfile}.out
+            ${resultfile}.out.err
+    )
+    set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES
+        DEPENDS H5DUMP-${resultfile}
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds"
+    )
   endmacro ()
 
   macro (ADD_H5_VDS_PREFIX_TEST resultfile resultcode)
diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake
index d735257..a09256d 100644
--- a/tools/test/h5dump/CMakeTestsXML.cmake
+++ b/tools/test/h5dump/CMakeTestsXML.cmake
@@ -175,15 +175,20 @@
   endmacro ()
 
   macro (ADD_XML_H5_TEST resultfile resultcode)
+    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"
+    )
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP_XML-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_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")
       endif ()
-      if (last_xml_test)
-        set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES DEPENDS ${last_xml_test})
-      endif ()
     else ()
       add_test (
           NAME H5DUMP_XML-${resultfile}
@@ -198,6 +203,20 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
     endif ()
+    set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES
+        DEPENDS H5DUMP_XML-${resultfile}-clear-objects
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml"
+    )
+    add_test (
+        NAME H5DUMP_XML-${resultfile}-clean-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${resultfile}.out
+            ${resultfile}.out.err
+    )
+    set_tests_properties (H5DUMP_XML-${resultfile}-clean-objects PROPERTIES
+        DEPENDS H5DUMP_XML-${resultfile}
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml"
+    )
   endmacro ()
 
 ##############################################################################
diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake
index 7ab8c1f..bd189da 100644
--- a/tools/test/h5dump/CMakeVFDTests.cmake
+++ b/tools/test/h5dump/CMakeVFDTests.cmake
@@ -42,6 +42,15 @@ add_custom_target(HDF5_VFD_H5DUMP_files ALL COMMENT "Copying files needed by HDF
 macro (ADD_VFD_H5DUMP_TEST vfdname resultfile resultcode)
   if (NOT HDF5_ENABLE_USING_MEMCHECKER)
     add_test (
+        NAME H5DUMP_VFD-${resultfile}-clear-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${resultfile}.out
+            ${resultfile}.out.err
+    )
+    set_tests_properties (H5DUMP_VFD-${resultfile}-clear-objects PROPERTIES
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}"
+    )
+    add_test (
         NAME H5DUMP_VFD-${vfdname}-${resultfile}-h5dump
         COMMAND "${CMAKE_COMMAND}"
             -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
@@ -55,6 +64,21 @@ macro (ADD_VFD_H5DUMP_TEST vfdname resultfile resultcode)
             -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
     )
     set_tests_properties (H5DUMP_VFD-${vfdname}-${resultfile}-h5dump PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT})
+    set_tests_properties (H5DUMP_VFD-${resultfile} PROPERTIES
+        DEPENDS H5DUMP_VFD-${resultfile}-clear-objects
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}"
+    )
+    add_test (
+        NAME H5DUMP_VFD-${resultfile}-clean-objects
+        COMMAND ${CMAKE_COMMAND} -E remove
+            ${resultfile}.out
+            ${resultfile}.out.err
+    )
+    set_tests_properties (H5DUMP_VFD-${resultfile}-clean-objects PROPERTIES
+        DEPENDS H5DUMP_VFD-${resultfile}
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}"
+    )
+  endmacro ()
   endif ()
 endmacro ()