Merge pull request #1045 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.10/master to 1.10/masterhdf5-1_10_2

* commit 'cc2eea14f6a6532a201dde13af13353d4d73fd92': (1014 commits)
  Commit release date changes.
  Fix typo in INSTALL_Cygwin.txt
  Update references and merge from 1_10
  Corrected email address
  Commit Barbara's INSTALL* file updates.
  Commit Elena's RELEASE.txt edits and Les'/Lori's README.txt revision.
  ommit Elena's RELEASE.txt edits and Les'/Lori's README.txt revision.
  Remove stray '/'.
  Add subdirectory for CMake-HDF5-1.10.2.zip.
  Correct name of hl compile script
  Add directory in release CMake...tar.gz file.
  Minor edits in RELEASE.txt. Set version for HDF5 1.10.2 release.
  release branch should not generate headers
  Switch default build mode to production. Set version to 1.10.2-pre2..
  HDFF5-1.10.2-pre1 releaseed. Add links for security bug fixes to RELEASE.txt.
  Fix VS2017 binary readme
  Couple fixes to the test routine for HDFFV-10425.
  Add test and release info for the fix to HDFFV-10425 test failure with H5DOwrite_chunk.
  Updated RELEASE.txt
  Remove known probelem that was fixed.
  ...

1 files changed, 27 insertions, 1 deletions

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}"