[svn-r24392] Cleanup testfiles from scripts. Update lists of files to be cleaned. CMake update to clean testfiles.

Tested: local cmake, autools, and h5committest

5 files changed, 48 insertions, 4 deletions

diff --git a/hl/c++/examples/CMakeTests.cmake b/hl/c++/examples/CMakeTests.cmake
index 95cc8b4..c73ceeb 100644
--- a/hl/c++/examples/CMakeTests.cmake
+++ b/hl/c++/examples/CMakeTests.cmake
@@ -4,5 +4,13 @@
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
+# Remove any output file left over from previous test run
+ADD_TEST (
+    NAME cpp_hl_ex_ptExampleFL-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove 
+            PTcppexampleFL.h5
+)
 
 ADD_TEST (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
+SET_TESTS_PROPERTIES (cpp_hl_ex_ptExampleFL PROPERTIES DEPENDS cpp_hl_ex_ptExampleFL-clear-objects)
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index 36c799d..a9c5258 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -6,7 +6,7 @@ PROJECT (HDF5_HL_EXAMPLES )
 #-----------------------------------------------------------------------------
 SET (examples
     ex_lite1
-    ex_lite2
+    ex_lite2    #ex_lite2 PROPERTIES DEPENDS ex_lite1)
     ex_lite3
     ptExampleFL
     ex_image1
diff --git a/hl/examples/CMakeTests.cmake b/hl/examples/CMakeTests.cmake
index e1ccba0..0f9ca11 100644
--- a/hl/examples/CMakeTests.cmake
+++ b/hl/examples/CMakeTests.cmake
@@ -21,8 +21,40 @@ FOREACH (h5_file ${HDF5_TEST_FILES})
   )
 ENDFOREACH (h5_file ${HDF5_TEST_FILES})
 
+  # Remove any output file left over from previous test run
+  ADD_TEST (
+      NAME hl_ex-clear-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove 
+    ex_lite1.h5
+    ex_lite2.h5
+    ex_lite3.h5
+    packet_table_FLexample.h5
+    ex_image1.h5
+    ex_image2.h5
+    ex_table_01.h5
+    ex_table_02.h5
+    ex_table_03.h5
+    ex_table_04.h5
+    ex_table_05.h5
+    ex_table_06.h5
+    ex_table_07.h5
+    ex_table_08.h5
+    ex_table_09.h5
+    ex_table_10.h5
+    ex_table_11.h5
+    ex_table_12.h5
+    ex_ds1.h5
+  )
+  IF (NOT "${last_test}" STREQUAL "")
+    SET_TESTS_PROPERTIES (hl_ex-clear-objects PROPERTIES DEPENDS ${last_test})
+  ENDIF (NOT "${last_test}" STREQUAL "")
+  SET (last_test "hl_ex-clear-objects")
+
 FOREACH (example ${examples})
   ADD_TEST (NAME hl_ex_${example} COMMAND $<TARGET_FILE:hl_ex_${example}>)
+    IF (NOT "${last_test}" STREQUAL "")
+      SET_TESTS_PROPERTIES (hl_ex_${example} PROPERTIES DEPENDS ${last_test})
+    ENDIF (NOT "${last_test}" STREQUAL "")
+    SET (last_test "hl_ex_${example}")
 ENDFOREACH (example ${examples})
-
-SET_TESTS_PROPERTIES (hl_ex_ex_lite2 PROPERTIES DEPENDS hl_ex_ex_lite1)
diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake
index 96209aa..81253bd 100644
--- a/hl/fortran/test/CMakeTests.cmake
+++ b/hl/fortran/test/CMakeTests.cmake
@@ -15,8 +15,9 @@ ADD_TEST (
         dsetf3.h5
         dsetf4.h5
         dsetf5.h5
-        f1image.h5
+        f1img.h5
         f1tab.h5
+        tstds.h5
 )
 
 ADD_TEST (NAME hl_f90_tstds COMMAND $<TARGET_FILE:hl_f90_tstds>)
diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake
index aa9c1c3..5d42b57 100644
--- a/hl/test/CMakeTests.cmake
+++ b/hl/test/CMakeTests.cmake
@@ -47,12 +47,15 @@ ADD_TEST (
         test_ds7.h5
         test_ds8.h5
         test_ds9.h5
+        test_ds10.h5
         test_dectris.h5
         test_image1.h5
         test_image2.h5
         test_image3.h5
         test_lite1.h5
         test_lite2.h5
+        test_lite3.h5
+        test_lite4.h5
         test_packet_compress.h5
         test_packet_table.h5
         test_table.h5