Cleanup cmake clean macros

14 files changed, 343 insertions, 175 deletions

diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake
index 58879cf..b60c0e9 100644
--- a/tools/test/h5copy/CMakeTests.cmake
+++ b/tools/test/h5copy/CMakeTests.cmake
@@ -231,6 +231,8 @@
           COMMAND    ${CMAKE_COMMAND}
               -E remove
               ./testfiles/${testname}.out.h5
+              ./testfiles/${testname}.out.out
+              ./testfiles/${testname}.out.out.err
       )
       add_test (
           NAME H5COPY-CMP-${testname}
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 6dae99d..1c15880 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -373,6 +373,17 @@
         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 (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5DIFF-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
       add_test (
           NAME H5DIFF-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -385,6 +396,7 @@
               -D "TEST_APPEND=EXIT CODE:"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS H5DIFF-${resultfile}-clear-objects)
     endif ()
     if (H5_HAVE_PARALLEL)
       ADD_PH5_TEST (${resultfile} ${resultcode} ${ARGN})
@@ -403,6 +415,17 @@
         set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES DEPENDS ${last_test})
       endif ()
     else ()
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5DIFF_ERR-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/${resultfile}_ERR.out
+              testfiles/${resultfile}_ERR.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5DIFF_ERR-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
       add_test (
           NAME H5DIFF_ERR-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -416,9 +439,7 @@
               -D "TEST_APPEND=EXIT CODE:"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-    endif ()
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES DEPENDS ${last_test})
+      set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES DEPENDS H5DIFF_ERR-${resultfile}-clear-objects)
     endif ()
     set (last_test "H5DIFF_ERR-${resultfile}")
   endmacro ()
@@ -435,6 +456,17 @@
         set_tests_properties (PH5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
       endif ()
     else ()
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME PH5DIFF-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              PAR/testfiles/${resultfile}.out
+              PAR/testfiles/${resultfile}.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (PH5DIFF-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
       add_test (
           NAME PH5DIFF-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -450,9 +482,7 @@
               -D "TEST_SORT_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (PH5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
+      set_tests_properties (PH5DIFF-${resultfile} PROPERTIES DEPENDS PH5DIFF-${resultfile}-clear-objects)
       set (last_test "PH5DIFF-${resultfile}")
     endif ()
   endmacro ()
@@ -461,7 +491,7 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       # Remove any output file left over from previous test run
       add_test (
-          NAME H5DIFF_UD-${testname}-clearall-objects
+          NAME H5DIFF_UD-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove
               testfiles/${resultfile}.out
@@ -498,7 +528,7 @@
                 -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
         )
       endif ()
-      set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DEPENDS H5DIFF_UD-${testname}-clearall-objects)
+      set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DEPENDS H5DIFF_UD-${testname}-clear-objects)
     endif ()
   endmacro ()
 
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 4bc33f8..cdd3e6d 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -407,8 +407,19 @@
       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 (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5DUMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
       add_test (
-          NAME H5DUMP-h5dump-${testname}
+          NAME H5DUMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
               -D "TEST_ARGS:STRING=${ARGN}"
@@ -418,6 +429,7 @@
               -D "TEST_REFERENCE=h5dump-${testname}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP-${testname} PROPERTIES DEPENDS H5DUMP-${testname}-clear-objects)
     endif ()
   endmacro ()
 
@@ -449,7 +461,10 @@
       add_test (
           NAME H5DUMP-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}.bin
+              -E remove
+              ${resultfile}.bin
+              ${resultfile}.out
+              ${resultfile}.out.err
       )
       set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
@@ -482,7 +497,10 @@
       add_test (
           NAME H5DUMP-N-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}-N.bin
+              -E remove
+              ${resultfile}-N.bin
+              ${resultfile}-N.out
+              ${resultfile}-N.out.err
       )
       set_tests_properties (H5DUMP-N-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
@@ -515,7 +533,10 @@
       add_test (
           NAME H5DUMP-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}.txt
+              -E remove
+              ${resultfile}.txt
+              ${resultfile}.out
+              ${resultfile}.out.err
       )
       set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
@@ -555,7 +576,11 @@
       add_test (
           NAME H5DUMP-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${ddlfile}.txt ${resultfile}.txt
+              -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 (
@@ -613,6 +638,15 @@
 
   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}"
@@ -625,11 +659,21 @@
               -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_H5ERR_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}"
@@ -643,11 +687,21 @@
               -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_H5ERR_MASK_ENV_TEST resultfile resultcode 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}"
@@ -663,6 +717,7 @@
               -D "TEST_ENV_VALUE:STRING=${envval}"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
   endmacro ()
 
@@ -672,7 +727,10 @@
       add_test (
           NAME H5DUMP-IMPORT-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}.bin ${resultfile}.h5
+              -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 (
@@ -700,12 +758,13 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       # Remove any output file left over from previous test run
       add_test (
-          NAME H5DUMP_UD-${testname}-clearall-objects
+          NAME H5DUMP_UD-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove
-              testfiles/std/${resultfile}.out
-              testfiles/std/${resultfile}.out.err
+              ${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}"
@@ -719,7 +778,7 @@
               -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP_UD-${testname} PROPERTIES DEPENDS H5DUMP_UD-${testname}-clearall-objects)
+      set_tests_properties (H5DUMP_UD-${testname} PROPERTIES DEPENDS H5DUMP_UD-${testname}-clear-objects)
     endif ()
   endmacro ()
 
diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake
index 986f1a1..4f3ee9f 100644
--- a/tools/test/h5dump/CMakeTestsPBITS.cmake
+++ b/tools/test/h5dump/CMakeTestsPBITS.cmake
@@ -131,6 +131,15 @@
         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}"
@@ -142,6 +151,7 @@
               -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 ()
 
diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake
index 1344b9a..3addecf 100644
--- a/tools/test/h5dump/CMakeTestsVDS.cmake
+++ b/tools/test/h5dump/CMakeTestsVDS.cmake
@@ -110,6 +110,15 @@
         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}"
@@ -121,6 +130,7 @@
               -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 ()
 
@@ -136,6 +146,15 @@
         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}"
diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake
index 18148a1..0f8875f 100644
--- a/tools/test/h5dump/CMakeTestsXML.cmake
+++ b/tools/test/h5dump/CMakeTestsXML.cmake
@@ -164,7 +164,7 @@
     if ("${testtype}" STREQUAL "SKIP")
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
-            NAME H5DUMP-XML-${skipresultfile}-SKIPPED
+            NAME H5DUMP_XML-${skipresultfile}-SKIPPED
             COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile}.xml --xml ${ARGN}"
         )
       endif ()
@@ -175,7 +175,7 @@
 
   macro (ADD_XML_H5_TEST resultfile resultcode)
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-XML-${resultfile} COMMAND $<TARGET_FILE:h5dump> --xml ${ARGN})
+      add_test (NAME H5DUMP_XML-${resultfile} COMMAND $<TARGET_FILE:h5dump> --xml ${ARGN})
       set_tests_properties (H5DUMP-XML-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml")
       if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (H5DUMP-XML-${resultfile} PROPERTIES WILL_FAIL "true")
@@ -184,8 +184,17 @@
         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}
+          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_PROGRAM=$<TARGET_FILE:h5dump>"
               -D "TEST_ARGS:STRING=--xml;${ARGN}"
@@ -195,6 +204,7 @@
               -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 ()
 
diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake
index 3e423da..4af220b 100644
--- a/tools/test/h5format_convert/CMakeTests.cmake
+++ b/tools/test/h5format_convert/CMakeTests.cmake
@@ -94,7 +94,10 @@
       add_test (
           NAME H5FC-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ./testfiles/outtmp.h5
+              -E remove
+              ./testfiles/outtmp.h5
+              ./testfiles/${testname}.out
+              ./testfiles/${testname}.out.err
       )
       if (NOT "${last_test}" STREQUAL "")
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -143,7 +146,10 @@
       add_test (
           NAME H5FC-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ./testfiles/tmp.h5
+              -E remove
+              ./testfiles/tmp.h5
+              ./testfiles/${testname}.out
+              ./testfiles/${testname}.out.err
       )
       if (NOT "${last_test}" STREQUAL "")
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -187,7 +193,10 @@
       add_test (
           NAME H5FC-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ./testfiles/chktmp.h5
+              -E remove
+              ./testfiles/chktmp.h5
+              ./testfiles/${testname}.out
+              ./testfiles/${testname}.out.err
       )
       if (NOT "${last_test}" STREQUAL "")
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -225,7 +234,12 @@
       add_test (
           NAME H5FC-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ./testfiles/dmptmp.h5
+              -E remove
+              ./testfiles/dmptmp.h5
+              ./testfiles/${testname}.out
+              ./testfiles/${testname}.out.err
+              ./testfiles/${testname}_chk.out
+              ./testfiles/${testname}_chk.out.err
       )
       if (NOT "${last_test}" STREQUAL "")
         set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -254,7 +268,7 @@
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
               -D "TEST_ARGS:STRING=-BH;./testfiles/dmptmp.h5"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-              -D "TEST_OUTPUT=testfiles/${testname}.out"
+              -D "TEST_OUTPUT=testfiles/${testname}_chk.out"
               -D "TEST_EXPECT=0"
               -D "TEST_REFERENCE=testfiles/${testname}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake
index ae6d440..66ff715 100644
--- a/tools/test/h5jam/CMakeTests.cmake
+++ b/tools/test/h5jam/CMakeTests.cmake
@@ -60,6 +60,13 @@
       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_PROGRAM=$<TARGET_FILE:h5jam>"
@@ -70,6 +77,7 @@
               -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 ()
 
@@ -86,6 +94,13 @@
       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_PROGRAM=$<TARGET_FILE:h5unjam>"
@@ -96,6 +111,7 @@
               -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 ()
 
@@ -103,6 +119,16 @@
     # 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_PROGRAM=$<TARGET_FILE:h5dump>"
@@ -114,7 +140,7 @@
               -D "TEST_SKIP_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS ${testdepends})
+      set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS H5JAM-${testname}-CHECKFILE-clear-objects)
       add_test (
           NAME H5JAM-${testname}-CHECKFILE-H5DMP_CMP
           COMMAND "${CMAKE_COMMAND}"
diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake
index 97b453b..d03a344 100644
--- a/tools/test/h5ls/CMakeTests.cmake
+++ b/tools/test/h5ls/CMakeTests.cmake
@@ -136,6 +136,14 @@
         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}"
@@ -147,6 +155,7 @@
               -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 ()
 
@@ -154,7 +163,7 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       # Remove any output file left over from previous test run
       add_test (
-          NAME H5LS_UD-${testname}-clearall-objects
+          NAME H5LS_UD-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove
               testfiles/${resultfile}.out
@@ -173,7 +182,7 @@
               -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5LS_UD-${testname} PROPERTIES DEPENDS H5LS_UD-${testname}-clearall-objects)
+      set_tests_properties (H5LS_UD-${testname} PROPERTIES DEPENDS H5LS_UD-${testname}-clear-objects)
     endif ()
   endmacro ()
 
diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake
index c573323..5df61bb 100644
--- a/tools/test/h5ls/CMakeTestsVDS.cmake
+++ b/tools/test/h5ls/CMakeTestsVDS.cmake
@@ -82,6 +82,14 @@
       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_PROGRAM=$<TARGET_FILE:h5ls>"
@@ -92,6 +100,7 @@
               -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 ()
 
diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake
index bab6593..8d796ad 100644
--- a/tools/test/h5stat/CMakeTests.cmake
+++ b/tools/test/h5stat/CMakeTests.cmake
@@ -20,37 +20,37 @@
   # Copy all the HDF5 files from the test directory into the source directory
   # --------------------------------------------------------------------
   set (HDF5_REFERENCE_FILES
-      h5stat_help1.ddl
-      h5stat_help2.ddl
-      h5stat_notexist.ddl
-      h5stat_nofile.ddl
-      h5stat_filters.ddl
-      h5stat_filters-file.ddl
-      h5stat_filters-F.ddl
-      h5stat_filters-d.ddl
-      h5stat_filters-g.ddl
-      h5stat_filters-dT.ddl
-      h5stat_filters-UD.ddl
-      h5stat_filters-UT.ddl
-      h5stat_tsohm.ddl
-      h5stat_newgrat.ddl
-      h5stat_newgrat-UG.ddl
-      h5stat_newgrat-UA.ddl
-      h5stat_err1_links.ddl
-      h5stat_links1.ddl
-      h5stat_links2.ddl
-      h5stat_links3.ddl
-      h5stat_links4.ddl
-      h5stat_links5.ddl
-      h5stat_err1_dims.ddl
-      h5stat_dims1.ddl
-      h5stat_dims2.ddl
-      h5stat_err1_numattrs.ddl
-      h5stat_err2_numattrs.ddl
-      h5stat_numattrs1.ddl
-      h5stat_numattrs2.ddl
-      h5stat_numattrs3.ddl
-      h5stat_numattrs4.ddl
+      h5stat_help1
+      h5stat_help2
+      h5stat_notexist
+      h5stat_nofile
+      h5stat_filters
+      h5stat_filters-file
+      h5stat_filters-F
+      h5stat_filters-d
+      h5stat_filters-g
+      h5stat_filters-dT
+      h5stat_filters-UD
+      h5stat_filters-UT
+      h5stat_tsohm
+      h5stat_newgrat
+      h5stat_newgrat-UG
+      h5stat_newgrat-UA
+      h5stat_err1_links
+      h5stat_links1
+      h5stat_links2
+      h5stat_links3
+      h5stat_links4
+      h5stat_links5
+      h5stat_err1_dims
+      h5stat_dims1
+      h5stat_dims2
+      h5stat_err1_numattrs
+      h5stat_err2_numattrs
+      h5stat_numattrs1
+      h5stat_numattrs2
+      h5stat_numattrs3
+      h5stat_numattrs4
   )
   set (HDF5_REFERENCE_TEST_FILES
       h5stat_filters.h5
@@ -60,7 +60,7 @@
   )
 
   foreach (ddl_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}" "${PROJECT_BINARY_DIR}/${ddl_file}" "h5stat_files")
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
@@ -86,6 +86,16 @@
       endif ()
     else (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
+          NAME H5STAT-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${resultfile}.out
+              ${resultfile}.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5STAT-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
+      add_test (
           NAME H5STAT-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5stat>"
@@ -96,6 +106,7 @@
               -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 ()
 
@@ -107,72 +118,13 @@
 
   if (HDF5_ENABLE_USING_MEMCHECKER)
     # Remove any output file left over from previous test run
+    foreach (ddl_file ${HDF5_REFERENCE_FILES})
+      set (CLEAR_LIST ${CLEAR_LIST} ${ddl_file}.out ${ddl_file}.out.err)
+    endforeach ()
     add_test (
       NAME H5STAT-clearall-objects
       COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          h5stat_help1.out
-          h5stat_help1.out.err
-          h5stat_help2.out
-          h5stat_help2.out.err
-          h5stat_notexist.out
-          h5stat_notexist.out.err
-          h5stat_nofile.out
-          h5stat_nofile.out.err
-          h5stat_filters.out
-          h5stat_filters.out.err
-          h5stat_filters-file.out
-          h5stat_filters-file.out.err
-          h5stat_filters-F.out
-          h5stat_filters-F.out.err
-          h5stat_filters-d.out
-          h5stat_filters-d.out.err
-          h5stat_filters-g.out
-          h5stat_filters-g.out.err
-          h5stat_filters-dT.out
-          h5stat_filters-dT.out.err
-          h5stat_filters-UD.out
-          h5stat_filters-UD.out.err
-          h5stat_filters-UT.out
-          h5stat_filters-UT.out.err
-          h5stat_tsohm.out
-          h5stat_tsohm.out.err
-          h5stat_newgrat.out
-          h5stat_newgrat.out.err
-          h5stat_newgrat-UG.out
-          h5stat_newgrat-UG.out.err
-          h5stat_newgrat-UA.out
-          h5stat_newgrat-UA.out.err
-          h5stat_err1_links.out
-          h5stat_err1_links.out.err
-          h5stat_links1.out
-          h5stat_links1.out.err
-          h5stat_links2.out
-          h5stat_links2.out.err
-          h5stat_links3.out
-          h5stat_links3.out.err
-          h5stat_links4.out
-          h5stat_links4.out.err
-          h5stat_links5.out
-          h5stat_links5.out.err
-          h5stat_err1_dims.out
-          h5stat_err1_dims.out.err
-          h5stat_dims1.out
-          h5stat_dims1.out.err
-          h5stat_dims2.out
-          h5stat_dims2.out.err
-          h5stat_err1_numattrs.out
-          h5stat_err1_numattrs.out.err
-          h5stat_err2_numattrs.out
-          h5stat_err2_numattrs.out.err
-          h5stat_numattrs1.out
-          h5stat_numattrs1.out.err
-          h5stat_numattrs2.out
-          h5stat_numattrs2.out.err
-          h5stat_numattrs3.out
-          h5stat_numattrs3.out.err
-          h5stat_numattrs4.out
-          h5stat_numattrs4.out.err
+          -E remove ${CLEAR_LIST}
     )
     if (NOT "${last_test}" STREQUAL "")
       set_tests_properties (H5STAT-clearall-objects PROPERTIES DEPENDS ${last_test})
diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake
index 7eba4a1..b9095fb 100644
--- a/tools/test/misc/CMakeTestsClear.cmake
+++ b/tools/test/misc/CMakeTestsClear.cmake
@@ -61,8 +61,8 @@
           NAME H5CLEAR_CMP-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove
-                  ${testname}.out
-                  ${testname}.out.err
+                  testfiles/${testname}.out
+                  testfiles/${testname}.out.err
       )
       add_test (
           NAME H5CLEAR_CMP-${testname}
@@ -94,34 +94,36 @@
     endif ()
   endmacro ()
 
-  macro (ADD_H5_TEST testname resultcode)
+  macro (ADD_H5_TEST testname testfile resultcode)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
-          NAME H5CLEAR-clear_open_chk-copy_${testname}.h5
+          NAME H5CLEAR-clr_open_chk-copy_${testname}.h5
           COMMAND    ${CMAKE_COMMAND}
               -E copy_if_different
-              "${PROJECT_SOURCE_DIR}/testfiles/${testname}.h5" "${PROJECT_BINARY_DIR}/testfiles/${testname}.h5"
+              "${PROJECT_SOURCE_DIR}/testfiles/${testfile}.h5" "${PROJECT_BINARY_DIR}/testfiles/${testfile}.h5"
       )
       if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5CLEAR-clear_open_chk-copy_${testname}.h5 PROPERTIES DEPENDS ${last_test})
+        set_tests_properties (H5CLEAR-clr_open_chk-copy_${testname}.h5 PROPERTIES DEPENDS ${last_test})
       endif ()
-      set (last_test "H5CLEAR-clear_open_chk-copy_${testname}.h5")
+      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-clear_open_chk-${testname}_${resultcode} COMMAND $<TARGET_FILE:clear_open_chk> ${testname}.h5)
-      set_tests_properties (H5CLEAR-clear_open_chk-${testname}_${resultcode} PROPERTIES WILL_FAIL "${resultcode}")
-      set_tests_properties (H5CLEAR-clear_open_chk-${testname}_${resultcode} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+      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 (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5CLEAR-clear_open_chk-${testname}_${resultcode} PROPERTIES DEPENDS ${last_test})
+        set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES DEPENDS ${last_test})
       endif ()
+
       # After "h5clear" the file, the subsequent file open succeeds
-      add_test (NAME H5CLEAR-h5clear-${testname} COMMAND $<TARGET_FILE:h5clear> -s ${testname}.h5)
-      set_tests_properties (H5CLEAR-h5clear-${testname} PROPERTIES DEPENDS H5CLEAR-clear_open_chk-${testname}_${resultcode})
-      set_tests_properties (H5CLEAR-h5clear-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      add_test (NAME H5CLEAR-clear_open_chk-${testname} COMMAND $<TARGET_FILE:clear_open_chk> ${testname}.h5)
-      set_tests_properties (H5CLEAR-clear_open_chk-${testname} PROPERTIES DEPENDS H5CLEAR-h5clear-${testname})
-      set_tests_properties (H5CLEAR-clear_open_chk-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      set (last_test "H5CLEAR-clear_open_chk-${testname}")
+      add_test (NAME H5CLEAR-h5clr-${testname} COMMAND $<TARGET_FILE:h5clear> -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}")
     endif ()
   endmacro ()
 
@@ -185,15 +187,15 @@ if (HDF5_ENABLE_USING_MEMCHECKER)
   endforeach ()
   # make second copy of mod_h5clear_mdc_image.h5
   add_test (
-      NAME H5CLEAR-copy_mod_h5clear_mdc_image2.h5
+      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 (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (H5CLEAR-copy_mod_h5clear_mdc_image2.h5 PROPERTIES DEPENDS ${last_test})
+    set_tests_properties (H5CLEAR-copy_mod_h5clr_mdc_image2.h5 PROPERTIES DEPENDS ${last_test})
   endif ()
-  set (last_test "H5CLEAR-copy_mod_h5clear_mdc_image2.h5")
+  set (last_test "H5CLEAR-copy_mod_h5clr_mdc_image2.h5")
 endif()
 
 #
@@ -210,16 +212,16 @@ endif()
 # "h5clear -m -s junk.h5"                   (valid 2 options, nonexisting file)
 # "h5clear -m orig_h5clear_sec2_v2.h5"      (valid 1 option, existing file, no cache image)
 # "h5clear -s -m orig_h5clear_sec2_v0.h5"   (valid 2 options, existing file, no cache image)
-  ADD_H5_CMP (h5clear_usage_h h5clear_usage 0 "-h")
-  ADD_H5_CMP (h5clear_usage h5clear_usage 1 "")
-  ADD_H5_CMP (h5clear_usage_junk h5clear_usage 1 "" junk.h5)
-  ADD_H5_CMP (h5clear_usage_none h5clear_usage 1 "" orig_h5clear_sec2_v3.h5)
-  ADD_H5_CMP (h5clear_missing_file_m h5clear_missing_file 1 "-m")
-  ADD_H5_CMP (h5clear_open_fail_s h5clear_open_fail 1 "-s" junk.h5)
-  ADD_H5_CMP (h5clear_missing_file_ms h5clear_missing_file 1 "-m" "-s")
-  ADD_H5_CMP (h5clear_open_fail_ms h5clear_open_fail 1 "-m" "-s"  junk.h5)
-  ADD_H5_CMP (h5clear_no_mdc_image_m h5clear_no_mdc_image 0 "-m" orig_h5clear_sec2_v2.h5)
-  ADD_H5_CMP (h5clear_no_mdc_image_ms h5clear_no_mdc_image 0 "-s" "-m" orig_h5clear_sec2_v0.h5)
+  ADD_H5_CMP (h5clr_usage_h h5clear_usage 0 "-h")
+  ADD_H5_CMP (h5clr_usage h5clear_usage 1 "")
+  ADD_H5_CMP (h5clr_usage_junk h5clear_usage 1 "" junk.h5)
+  ADD_H5_CMP (h5clr_usage_none h5clear_usage 1 "" orig_h5clear_sec2_v3.h5)
+  ADD_H5_CMP (h5clr_missing_file_m h5clear_missing_file 1 "-m")
+  ADD_H5_CMP (h5clr_open_fail_s h5clear_open_fail 1 "-s" junk.h5)
+  ADD_H5_CMP (h5clr_missing_file_ms h5clear_missing_file 1 "-m" "-s")
+  ADD_H5_CMP (h5clr_open_fail_ms h5clear_open_fail 1 "-m" "-s"  junk.h5)
+  ADD_H5_CMP (h5clr_no_mdc_image_m h5clear_no_mdc_image 0 "-m" orig_h5clear_sec2_v2.h5)
+  ADD_H5_CMP (h5clr_no_mdc_image_ms h5clear_no_mdc_image 0 "-s" "-m" orig_h5clear_sec2_v0.h5)
 #
 #
 #
@@ -235,30 +237,30 @@ endif()
 # "h5clear -l -m junk.h5"               (invalid/valid 2 options, nonexisting file, fail exit code)
 # "h5clear -m -l h5clear_sec2_v0.h5"    (valid/invalid 2 options, existing file, fail exit code)
 # "h5clear -l -m h5clear_sec2_v0.h5"    (invalid/valid 2 options, existing file, fail exit code)
-  ADD_H5_RETTEST (h5clear_mdc_image "false" "-m" h5clear_mdc_image.h5)
-  ADD_H5_RETTEST (h5clear_vers "false" "--vers")
-  ADD_H5_RETTEST (h5clear_k "true" "-k")
-  ADD_H5_RETTEST (h5clear_k_junk "true" "-k" junk.h5)
-  ADD_H5_RETTEST (h5clear_l_sec2 "true" "-l" h5clear_sec2_v2.h5)
-  ADD_H5_RETTEST (h5clear_mk "true" "-m" "-k")
-  ADD_H5_RETTEST (h5clear_lm "true" "-l" "-m")
-  ADD_H5_RETTEST (h5clear_ml_junk "true" "-m" "-l" junk.h5)
-  ADD_H5_RETTEST (h5clear_lm_junk "true" "-l" "-m" junk.h5)
-  ADD_H5_RETTEST (h5clear_ml_sec2 "true" "-m" "-l" h5clear_sec2_v0.h5)
-  ADD_H5_RETTEST (h5clear_lm_sec2 "true" "-l" "-m" h5clear_sec2_v0.h5)
+  ADD_H5_RETTEST (h5clr_mdc_image "false" "-m" h5clear_mdc_image.h5)
+  ADD_H5_RETTEST (h5clr_vers "false" "--vers")
+  ADD_H5_RETTEST (h5clr_k "true" "-k")
+  ADD_H5_RETTEST (h5clr_k_junk "true" "-k" junk.h5)
+  ADD_H5_RETTEST (h5clr_l_sec2 "true" "-l" h5clear_sec2_v2.h5)
+  ADD_H5_RETTEST (h5clr_mk "true" "-m" "-k")
+  ADD_H5_RETTEST (h5clr_lm "true" "-l" "-m")
+  ADD_H5_RETTEST (h5clr_ml_junk "true" "-m" "-l" junk.h5)
+  ADD_H5_RETTEST (h5clr_lm_junk "true" "-l" "-m" junk.h5)
+  ADD_H5_RETTEST (h5clr_ml_sec2 "true" "-m" "-l" h5clear_sec2_v0.h5)
+  ADD_H5_RETTEST (h5clr_lm_sec2 "true" "-l" "-m" h5clear_sec2_v0.h5)
 #
 #
 #
 # h5clear_mdc_image.h5 already has cache image removed earlier, verify the expected warning from h5clear:
-  ADD_H5_CMP (h5clear_mdc_image_m h5clear_no_mdc_image 0 "-m" mod_h5clear_mdc_image.h5)
-  ADD_H5_CMP (h5clear_mdc_image_sm h5clear_no_mdc_image 0 "-s" "-m" mod_h5clear_mdc_image2.h5)
+  ADD_H5_CMP (h5clr_mdc_image_m h5clear_no_mdc_image 0 "-m" mod_h5clear_mdc_image.h5)
+  ADD_H5_CMP (h5clr_mdc_image_sm h5clear_no_mdc_image 0 "-s" "-m" mod_h5clear_mdc_image2.h5)
 #
 #
 #
 # The following are tests to verify the status_flags field is cleared properly:
-  ADD_H5_TEST (h5clear_sec2_v3 "true")
-  ADD_H5_TEST (h5clear_log_v3 "true")
-  ADD_H5_TEST (latest_h5clear_sec2_v3 "true")
-  ADD_H5_TEST (latest_h5clear_log_v3 "true")
-  ADD_H5_TEST (h5clear_sec2_v0 "false")
-  ADD_H5_TEST (h5clear_sec2_v2 "false")
+  ADD_H5_TEST (h5clr_sec2_v3 h5clear_sec2_v3 "true")
+  ADD_H5_TEST (h5clr_log_v3 h5clear_log_v3 "true")
+  ADD_H5_TEST (latest_h5clr_sec2_v3 latest_h5clear_sec2_v3 "true")
+  ADD_H5_TEST (latest_h5clr_log_v3 latest_h5clear_log_v3 "true")
+  ADD_H5_TEST (h5clr_sec2_v0 h5clear_sec2_v0 "false")
+  ADD_H5_TEST (h5clr_sec2_v2 h5clear_sec2_v2 "false")
diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake
index 7011b19..e99983b 100644
--- a/tools/test/misc/CMakeTestsMkgrp.cmake
+++ b/tools/test/misc/CMakeTestsMkgrp.cmake
@@ -61,6 +61,8 @@
           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 ()
@@ -101,6 +103,8 @@
           COMMAND    ${CMAKE_COMMAND}
               -E remove
                   ${resultfile}.h5
+                  ${resultfile}.out
+                  ${resultfile}.out.err
       )
       set_tests_properties (H5MKGRP_CMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
       add_test (
diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake
index 39faa73..2bd8d46 100644
--- a/tools/test/perform/CMakeTests.cmake
+++ b/tools/test/perform/CMakeTests.cmake
@@ -25,7 +25,7 @@ add_custom_target(zip_perf_files ALL COMMENT "Copying files needed by zip_perf t
 
 # Remove any output file left over from previous test run
 add_test (
-    NAME PERFORM_h5perform-clear-objects
+    NAME PERFORM_h5perform-clearall-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove
         chunk.h5
@@ -36,6 +36,20 @@ add_test (
         x-rowmaj-rd.dat
         x-rowmaj-wr.dat
         x-gnuplot
+        h5perf_serial.txt
+        h5perf_serial.txt.err
+        chunk.txt
+        chunk.txt.err
+        iopipe.txt
+        iopipe.txt.err
+        overhead.txt
+        overhead.txt.err
+        perf_meta.txt
+        perf_meta.txt.err
+        zip_perf-h.txt
+        zip_perf-h.txt.err
+        zip_perf.txt
+        zip_perf.txt.err
 )
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -53,6 +67,7 @@ else ()
   )
 endif ()
 set_tests_properties (PERFORM_h5perf_serial PROPERTIES TIMEOUT 1800)
+set_tests_properties (PERFORM_h5perf_serial PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
 if (HDF5_BUILD_PERFORM_STANDALONE)
   add_test (NAME PERFORM_h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>)
@@ -72,6 +87,7 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
+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>)
@@ -87,6 +103,7 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
+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>)
@@ -102,6 +119,7 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
+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>)
@@ -117,6 +135,7 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
+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")
@@ -132,6 +151,8 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
+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)
 else ()
@@ -147,6 +168,7 @@ else ()
   )
 endif ()
 set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS PERFORM_zip_perf_help)
+set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
 if (H5_HAVE_PARALLEL)
   add_test (NAME PERFORM_h5perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf>)