summaryrefslogtreecommitdiffstats
path: root/hl/examples
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-11-01 21:26:11 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-11-01 21:26:11 (GMT)
commit08901f283eeb75bef514be2a8ea285475e154e0d (patch)
tree5a2e926b3aae6d96a7c3052e62b21784f7b43ca4 /hl/examples
parentd242fd85c4d280a85522bf6ad31e2998d10e1e08 (diff)
downloadhdf5-08901f283eeb75bef514be2a8ea285475e154e0d.zip
hdf5-08901f283eeb75bef514be2a8ea285475e154e0d.tar.gz
hdf5-08901f283eeb75bef514be2a8ea285475e154e0d.tar.bz2
[svn-r24393] Cleanup testfiles from scripts. Update lists of files to be cleaned. CMake update to clean testfiles.
Tested: local cmake, autotools
Diffstat (limited to 'hl/examples')
-rw-r--r--hl/examples/CMakeLists.txt2
-rw-r--r--hl/examples/CMakeTests.cmake36
2 files changed, 35 insertions, 3 deletions
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)