[svn-r19527] Add clear generated objects commands to test blocks.

Add configurefile command to copy CTestCustom to build folder. Tested: local linux
2025-03-19 16:50:46 +08:00 · 2010-10-06 15:49:54 -05:00 · 2010-10-06 15:49:54 -05:00 · 1f2c4afe77
commit 1f2c4afe77
parent 1f370978b4
16 changed files with 1106 additions and 68 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -659,6 +659,7 @@ IF (BUILD_TESTING)
    ENDIF (H5_HAVE_PARALLEL)
  ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
  INCLUDE (${HDF5_SOURCE_DIR}/CTestConfig.cmake)
+  CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/CTestCustom.cmake ${HDF5_BINARY_DIR}/CTestCustom.ctest @ONLY)
 ENDIF (BUILD_TESTING)

 #-----------------------------------------------------------------------------
--- a/2
+++ b/2
@ -1945,7 +1945,7 @@
 ./config/cmake/grepTest.cmake
 ./config/cmake/runTest.cmake
 ./config/cmake/vfdTest.cmake
-./config/cmake/CTestCustom.ctest
+./config/cmake/CTestCustom.cmake
 ./config/cmake/ConfigureChecks.cmake
 ./CMakeLists.txt
 ./CTestConfig.cmake
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@ -0,0 +1,38 @@
+SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1500)
+ 
+SET (CTEST_CUSTOM_WARNING_EXCEPTION
+    ${CTEST_CUSTOM_WARNING_EXCEPTION}
+    "H5detect.c.[0-9]+.[ ]*: warning C4090:"
+    "testhdf5.h.[0-9]+.[ ]*: warning C4005:"
+    "POSIX name for this item is deprecated"
+    "disabling jobserver mode"
+)
+ 
+SET (CTEST_CUSTOM_MEMCHECK_IGNORE
+    ${CTEST_CUSTOM_MEMCHECK_IGNORE}
+    h5test-clear-objects
+    h5perform-clear-objects
+    hl_test-clear-objects
+    hl_fortran_test-clear-objects
+    H5DIFF-clearall-objects
+    H5LS-clearall-objects
+    h5repart_20K-clear-objects
+    h5repart_5K-clear-objects
+    h5repart_sec2-clear-objects
+    H5IMPORT-clear-objects
+    H5REPACK-clearall-objects
+    H5COPY-clearall-objects
+    H5STAT-clearall-objects
+    H5DUMP-clearall-objects
+    H5DUMP-clear-out1
+    H5DUMP-clear-out3
+    H5DUMP-clear-objects
+    H5DUMP_PACKED_BITS-clearall-objects
+    H5DUMP-XML-clearall-objects
+    H5DUMP*
+    H5DIFF*
+    H5REPACK*
+    H5STAT*
+    H5COPY*
+    H5LS*
+)
--- a/config/cmake/CTestCustom.ctest
+++ b/config/cmake/CTestCustom.ctest
@ -1,19 +0,0 @@
-SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1500)
- 
-SET (CTEST_CUSTOM_WARNING_EXCEPTION
-    ${CTEST_CUSTOM_WARNING_EXCEPTION}
-    "H5detect.c.[0-9]+.[ ]*: warning C4090:"
-    "testhdf5.h.[0-9]+.[ ]*: warning C4005:"
-    "POSIX name for this item is deprecated"
-    "disabling jobserver mode"
-)
- 
-SET (CTEST_CUSTOM_MEMCHECK_IGNORE
-    ${CTEST_CUSTOM_MEMCHECK_IGNORE}
-    H5DUMP
-    H5DIFF
-    H5REPACK
-    H5STAT
-    H5COPY
-    H5LS
-)
--- a/hl/fortran/test/CMakeLists.txt
+++ b/hl/fortran/test/CMakeLists.txt
@ -12,6 +12,20 @@ LINK_DIRECTORIES (
    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
 )

+# Remove any output file left over from previous test run
+ADD_TEST (
+    NAME hl_fortran_test-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove 
+        dsetf1.h5
+        dsetf2.h5
+        dsetf3.h5
+        dsetf4.h5
+        dsetf5.h5
+        f1image.h5
+        f1tab.h5
+)
+
 #-- Adding test for hl_f90_tstlite
 ADD_EXECUTABLE (hl_f90_tstlite tstlite.f90)
 H5_NAMING (hl_f90_tstlite)
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@ -48,6 +48,33 @@ MACRO (HL_ADD_TEST hl_name files)
  ENDFOREACH (h5_file ${HL_REFERENCE_TEST_FILES})
 ENDMACRO (HL_ADD_TEST)

+# Remove any output file left over from previous test run
+ADD_TEST (
+    NAME hl_test-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove 
+        combine_tables1.h5
+        combine_tables2.h5
+        test_detach.h5
+        test_ds1.h5
+        test_ds2.h5
+        test_ds3.h5
+        test_ds4.h5
+        test_ds5.h5
+        test_ds6.h5
+        test_ds7.h5
+        test_ds8.h5
+        test_ds9.h5
+        test_image1.h5
+        test_image2.h5
+        test_image3.h5
+        test_lite1.h5
+        test_lite2.h5
+        test_packet_compress.h5
+        test_packet_table.h5
+        test_table.h5
+)
+
 HL_ADD_TEST (test_ds "dsdata.txt;dslat.txt;dslon.txt;test_ds_be.h5;test_ds_le.h5")
 HL_ADD_TEST (test_image "image8.txt;sepia.pal;earth.pal;image24pixel.txt;image24plane.txt;usa.wri")
 HL_ADD_TEST (test_lite "dtype_file.txt")
--- a/perform/CMakeLists.txt
+++ b/perform/CMakeLists.txt
@ -11,6 +11,21 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib )
 # Add Tests
 #-----------------------------------------------------------------------------

+# Remove any output file left over from previous test run
+ADD_TEST (
+    NAME h5perform-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove 
+        chunk.h5
+        iopipe.h5
+        iopipe.raw
+        x-diag-rd.dat
+        x-diag-wr.dat
+        x-rowmaj-rd.dat
+        x-rowmaj-wr.dat
+        x-gnuplot
+)
+
 #-- Adding test for h5perf_serial
 SET (h5perf_serial_SRCS
    ${HDF5_PERFORM_SOURCE_DIR}/sio_timer.c
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -168,6 +168,78 @@ MACRO (ADD_H5_TEST file)
  ADD_TEST (NAME ${file} COMMAND $<TARGET_FILE:${file}>)
 ENDMACRO (ADD_H5_TEST file)

+# Remove any output file left over from previous test run
+ADD_TEST (
+    NAME h5test-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove 
+        cache_test.h5
+        coord.h5
+        dt_arith1.h5
+        dt_arith2.h5
+        dtransform.h5
+        dtypes4.h5
+        dtypes5.h5
+        extlinks16A00000.h5
+        extlinks16A00001.h5
+        extlinks16A00002.h5
+        extlinks16B-b.h5
+        extlinks16B-g.h5
+        extlinks16B-l.h5
+        extlinks16B-r.h5
+        extlinks16B-s.h5
+        extlinks19B00000.h5
+        extlinks19B00001.h5
+        extlinks19B00002.h5
+        extlinks19B00003.h5
+        extlinks19B00004.h5
+        extlinks19B00005.h5
+        extlinks19B00006.h5
+        extlinks19B00007.h5
+        extlinks19B00008.h5
+        extlinks19B00009.h5
+        extlinks19B00010.h5
+        extlinks19B00011.h5
+        extlinks19B00012.h5
+        extlinks19B00013.h5
+        extlinks19B00014.h5
+        extlinks19B00015.h5
+        extlinks19B00016.h5
+        extlinks19B00017.h5
+        extlinks19B00018.h5
+        extlinks19B00019.h5
+        extlinks19B00020.h5
+        extlinks19B00021.h5
+        extlinks19B00022.h5
+        extlinks19B00023.h5
+        extlinks19B00024.h5
+        extlinks19B00025.h5
+        extlinks19B00026.h5
+        extlinks19B00027.h5
+        extlinks19B00028.h5
+        fheap.h5
+        objcopy_ext.h5
+        sys_file1
+        tattr.h5
+        testmeta.h5
+        tfile1.h5
+        tfile2.h5
+        tfile3.h5
+        tfile4.h5
+        tfile5.h5
+        th5o_file
+        th5s1.h5
+        th5s2.h5
+        th5s3.h5
+        tnullspace.h5
+        tselect.h5
+        tsohm.h5
+        tsohm_dst.h5
+        tsohm_src.h5
+        tstint1.h5
+        tstint2.h5
+)
+
 SET (H5_TESTS
    lheap
    ohdr
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@ -131,15 +131,23 @@ IF (BUILD_TESTING)
  SET (HDF_EXT_SRC_FILE h5copy_extlinks_src)
  SET (HDF_EXT_TRG_FILE h5copy_extlinks_trg)

-############# COPY OBJECTS ##############
-
  # Remove any output file left over from previous test run
  ADD_TEST (
-      NAME H5COPY-clear-objects
+      NAME H5COPY-clearall-objects
      COMMAND    ${CMAKE_COMMAND}
          -E remove 
          ./testfiles/${HDF_FILE1}.out.h5
+          ./testfiles/${HDF_FILE1}.out.ls
          ./testfiles/${HDF_FILE1}.out.out
+          ./testfiles/${HDF_FILE1}.out.out.err
+          ./testfiles/${HDF_FILE2}.out.h5
+          ./testfiles/${HDF_FILE2}.out.ls
+          ./testfiles/${HDF_FILE2}.out.out
+          ./testfiles/${HDF_FILE2}.out.out.err
+          ./testfiles/${HDF_EXT_SRC_FILE}.out.h5
+          ./testfiles/${HDF_EXT_SRC_FILE}.out.ls
+          ./testfiles/${HDF_EXT_SRC_FILE}.out.out
+          ./testfiles/${HDF_EXT_SRC_FILE}.out.out.err
  )
  
  # "Test copying various forms of datasets"
@ -190,6 +198,7 @@ IF (BUILD_TESTING)
          -E remove 
          ./testfiles/${HDF_FILE2}.out.h5
          ./testfiles/${HDF_FILE2}.out.out
+          ./testfiles/${HDF_FILE2}.out.out.err
  )

  # "Test copying object and region references"
@ -207,6 +216,7 @@ IF (BUILD_TESTING)
          -E remove 
          ./testfiles/${HDF_EXT_SRC_FILE}.out.h5
          ./testfiles/${HDF_EXT_SRC_FILE}.out.out
+          ./testfiles/${HDF_EXT_SRC_FILE}.out.out.err
  )

  # "Test copying external link directly without -f ext"
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@ -293,40 +293,314 @@ IF (BUILD_TESTING)
  # --------------------------------------------------------------------
  # test file names 
  # --------------------------------------------------------------------
-SET (FILE1 h5diff_basic1.h5)
-SET (FILE2 h5diff_basic2.h5)
-SET (FILE3 h5diff_types.h5)
-SET (FILE4 h5diff_dtypes.h5)
-SET (FILE5 h5diff_attr1.h5)
-SET (FILE6 h5diff_attr2.h5)
-SET (FILE7 h5diff_dset1.h5)
-SET (FILE8 h5diff_dset2.h5)
-SET (FILE9 h5diff_hyper1.h5)
-SET (FILE10 h5diff_hyper2.h5)
-SET (FILE11 h5diff_empty.h5)
-SET (FILE12 h5diff_links.h5)
-SET (FILE13 h5diff_softlinks.h5)
-SET (FILE14 h5diff_linked_softlink.h5)
-SET (FILE15 h5diff_extlink_src.h5)
-SET (FILE16 h5diff_extlink_trg.h5)
-SET (FILE17 h5diff_ext2softlink_src.h5)
-SET (FILE18 h5diff_ext2softlink_trg.h5)
-SET (DANGLE_LINK_FILE1 h5diff_danglelinks1.h5)
-SET (DANGLE_LINK_FILE2 h5diff_danglelinks2.h5)
-SET (GRP_RECURSE_FILE1 h5diff_grp_recurse1.h5)
-SET (GRP_RECURSE_FILE2 h5diff_grp_recurse2.h5)
-# group recursive - same structure via external links through files 
-SET (GRP_RECURSE1_EXT h5diff_grp_recurse_ext1.h5)
-SET (GRP_RECURSE2_EXT1 h5diff_grp_recurse_ext2-1.h5)
-SET (GRP_RECURSE2_EXT2 h5diff_grp_recurse_ext2-2.h5)
-SET (GRP_RECURSE2_EXT3 h5diff_grp_recurse_ext2-3.h5)
-# same structure, same obj name with different value
-SET (EXCLUDE_FILE1_1 h5diff_exclude1-1.h5)
-SET (EXCLUDE_FILE1_2 h5diff_exclude1-2.h5)
-# different structure and obj names
-SET (EXCLUDE_FILE2_1 h5diff_exclude2-1.h5)
-SET (EXCLUDE_FILE2_2 h5diff_exclude2-2.h5)
+  SET (FILE1 h5diff_basic1.h5)
+  SET (FILE2 h5diff_basic2.h5)
+  SET (FILE3 h5diff_types.h5)
+  SET (FILE4 h5diff_dtypes.h5)
+  SET (FILE5 h5diff_attr1.h5)
+  SET (FILE6 h5diff_attr2.h5)
+  SET (FILE7 h5diff_dset1.h5)
+  SET (FILE8 h5diff_dset2.h5)
+  SET (FILE9 h5diff_hyper1.h5)
+  SET (FILE10 h5diff_hyper2.h5)
+  SET (FILE11 h5diff_empty.h5)
+  SET (FILE12 h5diff_links.h5)
+  SET (FILE13 h5diff_softlinks.h5)
+  SET (FILE14 h5diff_linked_softlink.h5)
+  SET (FILE15 h5diff_extlink_src.h5)
+  SET (FILE16 h5diff_extlink_trg.h5)
+  SET (FILE17 h5diff_ext2softlink_src.h5)
+  SET (FILE18 h5diff_ext2softlink_trg.h5)
+  SET (DANGLE_LINK_FILE1 h5diff_danglelinks1.h5)
+  SET (DANGLE_LINK_FILE2 h5diff_danglelinks2.h5)
+  SET (GRP_RECURSE_FILE1 h5diff_grp_recurse1.h5)
+  SET (GRP_RECURSE_FILE2 h5diff_grp_recurse2.h5)
+  # group recursive - same structure via external links through files 
+  SET (GRP_RECURSE1_EXT h5diff_grp_recurse_ext1.h5)
+  SET (GRP_RECURSE2_EXT1 h5diff_grp_recurse_ext2-1.h5)
+  SET (GRP_RECURSE2_EXT2 h5diff_grp_recurse_ext2-2.h5)
+  SET (GRP_RECURSE2_EXT3 h5diff_grp_recurse_ext2-3.h5)
+  # same structure, same obj name with different value
+  SET (EXCLUDE_FILE1_1 h5diff_exclude1-1.h5)
+  SET (EXCLUDE_FILE1_2 h5diff_exclude1-2.h5)
+  # different structure and obj names
+  SET (EXCLUDE_FILE2_1 h5diff_exclude2-1.h5)
+  SET (EXCLUDE_FILE2_2 h5diff_exclude2-2.h5)

+  # Remove any output file left over from previous test run
+  ADD_TEST (
+      NAME H5DIFF-clearall-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove 
+          h5diff_10.out
+          h5diff_10.out.err
+          h5diff_100.out
+          h5diff_100.out.err
+          h5diff_101.out
+          h5diff_101.out.err
+          h5diff_102.out
+          h5diff_102.out.err
+          h5diff_11.out
+          h5diff_11.out.err
+          h5diff_12.out
+          h5diff_12.out.err
+          h5diff_13.out
+          h5diff_13.out.err
+          h5diff_14.out
+          h5diff_14.out.err
+          h5diff_15.out
+          h5diff_15.out.err
+          h5diff_16_1.out
+          h5diff_16_1.out.err
+          h5diff_16_2.out
+          h5diff_16_2.out.err
+          h5diff_16_3.out
+          h5diff_16_3.out.err
+          h5diff_17.out
+          h5diff_17.out.err
+          h5diff_171.out
+          h5diff_171.out.err
+          h5diff_172.out
+          h5diff_172.out.err
+          h5diff_18_1.out
+          h5diff_18_1.out.err
+          h5diff_18.out
+          h5diff_18.out.err
+          h5diff_20.out
+          h5diff_20.out.err
+          h5diff_200.out
+          h5diff_200.out.err
+          h5diff_201.out
+          h5diff_201.out.err
+          h5diff_202.out
+          h5diff_202.out.err
+          h5diff_203.out
+          h5diff_203.out.err
+          h5diff_204.out
+          h5diff_204.out.err
+          h5diff_205.out
+          h5diff_205.out.err
+          h5diff_206.out
+          h5diff_206.out.err
+          h5diff_207.out
+          h5diff_207.out.err
+          h5diff_21.out
+          h5diff_21.out.err
+          h5diff_22.out
+          h5diff_22.out.err
+          h5diff_23.out
+          h5diff_23.out.err
+          h5diff_24.out
+          h5diff_24.out.err
+          h5diff_25.out
+          h5diff_25.out.err
+          h5diff_26.out
+          h5diff_26.out.err
+          h5diff_27.out
+          h5diff_27.out.err
+          h5diff_28.out
+          h5diff_28.out.err
+          h5diff_300.out
+          h5diff_300.out.err
+          h5diff_400.out
+          h5diff_400.out.err
+          h5diff_401.out
+          h5diff_401.out.err
+          h5diff_402.out
+          h5diff_402.out.err
+          h5diff_403.out
+          h5diff_403.out.err
+          h5diff_404.out
+          h5diff_404.out.err
+          h5diff_405.out
+          h5diff_405.out.err
+          h5diff_406.out
+          h5diff_406.out.err
+          h5diff_407.out
+          h5diff_407.out.err
+          h5diff_408.out
+          h5diff_408.out.err
+          h5diff_409.out
+          h5diff_409.out.err
+          h5diff_410.out
+          h5diff_410.out.err
+          h5diff_411.out
+          h5diff_411.out.err
+          h5diff_412.out
+          h5diff_412.out.err
+          h5diff_413.out
+          h5diff_413.out.err
+          h5diff_414.out
+          h5diff_414.out.err
+          h5diff_415.out
+          h5diff_415.out.err
+          h5diff_416.out
+          h5diff_416.out.err
+          h5diff_417.out
+          h5diff_417.out.err
+          h5diff_418.out
+          h5diff_418.out.err
+          h5diff_419.out
+          h5diff_419.out.err
+          h5diff_420.out
+          h5diff_420.out.err
+          h5diff_421.out
+          h5diff_421.out.err
+          h5diff_422.out
+          h5diff_422.out.err
+          h5diff_423.out
+          h5diff_423.out.err
+          h5diff_424.out
+          h5diff_424.out.err
+          h5diff_425.out
+          h5diff_425.out.err
+          h5diff_450.out
+          h5diff_450.out.err
+          h5diff_451.out
+          h5diff_451.out.err
+          h5diff_452.out
+          h5diff_452.out.err
+          h5diff_453.out
+          h5diff_453.out.err
+          h5diff_454.out
+          h5diff_454.out.err
+          h5diff_455.out
+          h5diff_455.out.err
+          h5diff_456.out
+          h5diff_456.out.err
+          h5diff_457.out
+          h5diff_457.out.err
+          h5diff_458.out
+          h5diff_458.out.err
+          h5diff_459.out
+          h5diff_459.out.err
+          h5diff_480.out
+          h5diff_480.out.err
+          h5diff_481.out
+          h5diff_481.out.err
+          h5diff_482.out
+          h5diff_482.out.err
+          h5diff_483.out
+          h5diff_483.out.err
+          h5diff_484.out
+          h5diff_484.out.err
+          h5diff_50.out
+          h5diff_50.out.err
+          h5diff_51.out
+          h5diff_51.out.err
+          h5diff_52.out
+          h5diff_52.out.err
+          h5diff_53.out
+          h5diff_53.out.err
+          h5diff_54.out
+          h5diff_54.out.err
+          h5diff_55.out
+          h5diff_55.out.err
+          h5diff_56.out
+          h5diff_56.out.err
+          h5diff_57.out
+          h5diff_57.out.err
+          h5diff_58.out
+          h5diff_58.out.err
+          h5diff_500.out
+          h5diff_500.out.err
+          h5diff_501.out
+          h5diff_501.out.err
+          h5diff_502.out
+          h5diff_502.out.err
+          h5diff_503.out
+          h5diff_503.out.err
+          h5diff_504.out
+          h5diff_504.out.err
+          h5diff_505.out
+          h5diff_505.out.err
+          h5diff_506.out
+          h5diff_506.out.err
+          h5diff_507.out
+          h5diff_507.out.err
+          h5diff_508.out
+          h5diff_508.out.err
+          h5diff_509.out
+          h5diff_509.out.err
+          h5diff_510.out
+          h5diff_510.out.err
+          h5diff_511.out
+          h5diff_511.out.err
+          h5diff_512.out
+          h5diff_512.out.err
+          h5diff_513.out
+          h5diff_513.out.err
+          h5diff_514.out
+          h5diff_514.out.err
+          h5diff_515.out
+          h5diff_515.out.err
+          h5diff_516.out
+          h5diff_516.out.err
+          h5diff_517.out
+          h5diff_517.out.err
+          h5diff_518.out
+          h5diff_518.out.err
+          h5diff_600.out
+          h5diff_600.out.err
+          h5diff_601.out
+          h5diff_601.out.err
+          h5diff_603.out
+          h5diff_603.out.err
+          h5diff_604.out
+          h5diff_604.out.err
+          h5diff_605.out
+          h5diff_605.out.err
+          h5diff_606.out
+          h5diff_606.out.err
+          h5diff_607.out
+          h5diff_607.out.err
+          h5diff_608.out
+          h5diff_608.out.err
+          h5diff_609.out
+          h5diff_609.out.err
+          h5diff_610.out
+          h5diff_610.out.err
+          h5diff_612.out
+          h5diff_612.out.err
+          h5diff_613.out
+          h5diff_613.out.err
+          h5diff_614.out
+          h5diff_614.out.err
+          h5diff_615.out
+          h5diff_615.out.err
+          h5diff_616.out
+          h5diff_616.out.err
+          h5diff_617.out
+          h5diff_617.out.err
+          h5diff_618.out
+          h5diff_618.out.err
+          h5diff_619.out
+          h5diff_619.out.err
+          h5diff_621.out
+          h5diff_621.out.err
+          h5diff_622.out
+          h5diff_622.out.err
+          h5diff_623.out
+          h5diff_623.out.err
+          h5diff_624.out
+          h5diff_624.out.err
+          h5diff_625.out
+          h5diff_625.out.err
+          h5diff_626.out
+          h5diff_626.out.err
+          h5diff_627.out
+          h5diff_627.out.err
+          h5diff_628.out
+          h5diff_628.out.err
+          h5diff_629.out
+          h5diff_629.out.err
+          h5diff_70.out
+          h5diff_70.out.err
+          h5diff_80.out
+          h5diff_80.out.err
+          h5diff_90.out
+          h5diff_90.out.err
+  )

 # ############################################################################
 # # Common usage
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@ -473,6 +473,225 @@ IF (BUILD_TESTING)
 ##############################################################################
 ##############################################################################

+  # Remove any output file left over from previous test run
+  ADD_TEST (
+      NAME H5DUMP-clearall-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove 
+          tall-1.out
+          tall-1.out.err
+          tall-2.out
+          tall-2.out.err
+          tall-2A.out
+          tall-2A.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
+          tallfilters.out
+          tallfilters.out.err
+          tarray1.out
+          tarray1.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
+          tattrreg.out
+          tattrreg.out.err
+          tattrregR.out
+          tattrregR.out.err
+          tbinregR.out
+          tbinregR.out.err
+          tbigdims.out
+          tbigdims.out.err
+          tboot1.out
+          tboot1.out.err
+          tboot2.out
+          tboot2.out.err
+          tchar1.out
+          tchar1.out.err
+          tchunked.out
+          tchunked.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
+          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
+          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
+          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
+          tindicesyes.out
+          tindicesyes.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
+          tnamed_dtype_attr.out
+          tnamed_dtype_attr.out.err
+          tnestcomp-1.out
+          tnestcomp-1.out.err
+          tnbit.out
+          tnbit.out.err
+          tnofilename.out
+          tnofilename.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
+          tperror.out
+          tperror.out.err
+          treference.out
+          treference.out.err
+          tsaf.out
+          tsaf.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
+          tsplit_file.out
+          tsplit_file.out.err
+          tstr-1.out
+          tstr-1.out.err
+          tstr-2.out
+          tstr-2.out.err
+          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
+          tvlstr.out
+          tvlstr.out.err
+          tvms.out
+          tvms.out.err
+  )
+
  # test for displaying groups
  ADD_H5_TEST (tgroup-1 0 tgroup.h5)
  # test for displaying the selected groups
@ -583,11 +802,7 @@ IF (BUILD_TESTING)

  # test failure handling
  # Missing file name
-  IF (${USE_PACKED_BITS})
-    ADD_H5_TEST (tnofilename-with-packed-bits 1)
-  ELSE (${USE_PACKED_BITS})
-    ADD_H5_TEST (tnofilename 1)
-  ENDIF (${USE_PACKED_BITS})
+  ADD_H5_TEST (tnofilename 1)

  # rev. 2004

@ -774,13 +989,156 @@ IF (BUILD_TESTING)
  ADD_H5_TEST (textlinksrc 0 textlinksrc.h5)
  ADD_H5_TEST (textlinkfar 0 textlinkfar.h5)

-  # test for dataset packed bits 
-  SET (TESTTYPE "TEST")
-  IF (NOT ${USE_PACKED_BITS})
-    SET (TESTTYPE "SKIP")
-  ENDIF (NOT ${USE_PACKED_BITS})
-  ADD_SKIP_H5_TEST (tpackedbits 0 ${TESTTYPE} -d /dset1 -M 0,2 tdset.h5)
-  ADD_SKIP_H5_TEST (tpackedbits2 0 ${TESTTYPE} -d /dset1 -M 0,2,2,1 tdset.h5)
+  ####### test for dataset packed bits ######
+  IF (HDF5_USE_H5DUMP_PACKED_BITS)
+    # Remove any output file left over from previous test run
+    ADD_TEST (
+        NAME H5DUMP_PACKED_BITS-clearall-objects
+        COMMAND    ${CMAKE_COMMAND}
+            -E remove 
+            tpackedbits.out
+            tpackedbits.out.err
+            tpackedbits2.out
+            tpackedbits2.out.err
+    )
+    ADD_H5_TEST (tpackedbits 0 -d /dset1 -M 0,2 tdset.h5)
+    ADD_H5_TEST (tpackedbits2 0 -d /dset1 -M 0,2,2,1 tdset.h5)
+  ENDIF (HDF5_USE_H5DUMP_PACKED_BITS)
+   
+  # 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.h5.out
+          tbitfields.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
+          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
+          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
+  )

  ########## test XML
  ADD_XML_H5_TEST (tall.h5 0 tall.h5)
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@ -44,6 +44,22 @@ IF (BUILD_TESTING)
 ##############################################################################
 ##############################################################################

+  # Remove any output file left over from previous test run
+  ADD_TEST (
+      NAME H5IMPORT-clear-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove 
+          binfp64.bin
+          binin8.bin
+          binin8w.bin
+          binin16.bin
+          binin32.bin
+          binuin16.bin
+          binuin32.bin
+          txtin16.txt
+          txtin32.txt
+  )
+
  ADD_TEST (NAME h5importtest COMMAND $<TARGET_FILE:h5importtest>)
 ENDIF (BUILD_TESTING)

--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@ -151,6 +151,111 @@ IF (BUILD_TESTING)
 ##############################################################################
 ##############################################################################

+  # 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
+          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
+          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
+  )
+
  # test the help syntax
  ADD_H5_TEST (help-1 0 -w80 -h)
  ADD_H5_TEST (help-2 0 -w80 --help)
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@ -225,6 +225,72 @@ IF (BUILD_TESTING)
 ##############################################################################
 ##############################################################################

+  # Remove any output file left over from previous test run
+  ADD_TEST (
+      NAME H5REPACK-clearall-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove 
+          h5repack_attr.h5.out
+          h5repack_attr.h5.out.err
+          h5repack_deflate.h5.out
+          h5repack_deflate.h5.out.err
+          h5repack_early.h5.out
+          h5repack_early.h5.out.err
+          h5repack_ext.h5.out
+          h5repack_ext.h5.out.err
+          h5repack_fill.h5.out
+          h5repack_fill.h5.out.err
+          h5repack_filters.h5.out
+          h5repack_filters.h5.out.err
+          h5repack_fletcher.h5.out
+          h5repack_fletcher.h5.out.err
+          h5repack_hlink.h5.out
+          h5repack_hlink.h5.out.err
+          h5repack_layout.h5.out
+          h5repack_layout.h5.out.err
+          h5repack_layout.h5-v.out
+          h5repack_layout.h5-v.out.err
+          h5repack_layouto.h5.out
+          h5repack_layouto.h5.out.err
+          h5repack_layout2.h5-v.out
+          h5repack_layout2.h5-v.out.err
+          h5repack_named_dtypes.h5.out
+          h5repack_named_dtypes.h5.out.err
+          h5repack_nbit.h5.out
+          h5repack_nbit.h5.out.err
+          h5repack_objs.h5.out
+          h5repack_objs.h5.out.err
+          h5repack_refs.h5.out
+          h5repack_refs.h5.out.err
+          h5repack_shuffle.h5.out
+          h5repack_shuffle.h5.out.err
+          h5repack_soffset.h5.out
+          h5repack_soffset.h5.out.err
+          h5repack_szip.h5.out
+          h5repack_szip.h5.out.err
+          h5repack_attr_out.h5
+          h5repack_deflate_out.h5
+          h5repack_early_out.h5
+          h5repack_ext_out.h5
+          h5repack_fill_out.h5
+          h5repack_filters_out.h5
+          h5repack_fletcher_out.h5
+          h5repack_hlink_out.h5
+          h5repack_layout_out.h5
+          h5repack_layouto_out.h5
+          h5repack_layout2_out.h5
+          h5repack_named_dtypes_out.h5
+          h5repack_nbit_out.h5
+          h5repack_objs_out.h5
+          h5repack_refs_out.h5
+          h5repack_shuffle_out.h5
+          h5repack_soffset_out.h5
+          h5repack_szip_out.h5
+          h5repack_ub.h5
+          h5repack_ub_out.h5
+          h5repack_attr_refs_out.h5
+  )
+
  # --------------------------------------------------------------------
  # test file names 
  # --------------------------------------------------------------------
--- a/tools/h5stat/CMakeLists.txt
+++ b/tools/h5stat/CMakeLists.txt
@ -109,6 +109,41 @@ IF (BUILD_TESTING)
 ##############################################################################
 ##############################################################################

+  # Remove any output file left over from previous test run
+  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_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
+  )
+
 # Test for help flag
  ADD_H5_TEST (h5stat_help1 0 -h)
  ADD_H5_TEST (h5stat_help2 0 --help)
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@ -102,10 +102,36 @@ IF (BUILD_TESTING)
 ##############################################################################
 ##############################################################################

+  # Remove any output file left over from previous test run
+  ADD_TEST (
+      NAME h5repart_20K-clear-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove 
+          fst_family00000.h5
+  )
  # repartition family member size to 20,000 bytes.
  ADD_TEST (NAME h5repart_20K COMMAND $<TARGET_FILE:h5repart> -m 20000 family_file%05d.h5 fst_family%05d.h5)
+
+  # Remove any output file left over from previous test run
+  ADD_TEST (
+      NAME h5repart_5K-clear-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove 
+          scd_family00000.h5
+          scd_family00001.h5
+          scd_family00002.h5
+          scd_family00003.h5
+  )
  # repartition family member size to 5 KB.
  ADD_TEST (NAME h5repart_5K COMMAND $<TARGET_FILE:h5repart> -m 5k family_file%05d.h5 scd_family%05d.h5)
+
+  # Remove any output file left over from previous test run
+  ADD_TEST (
+      NAME h5repart_sec2-clear-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove 
+          family_to_sec2.h5
+  )
  # convert family file to sec2 file of 20,000 bytes
  ADD_TEST (NAME h5repart_sec2 COMMAND $<TARGET_FILE:h5repart> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5)