summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-10-06 20:51:02 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-10-06 20:51:02 (GMT)
commitc18db616e502fbdeed35966081a6aa6c4c61945d (patch)
tree6dc60d449a022be71b1a3b78ba83a2e3367f796a /hl
parent22db4c3113ba272b7797f6c7393f12c1149e3c91 (diff)
downloadhdf5-c18db616e502fbdeed35966081a6aa6c4c61945d.zip
hdf5-c18db616e502fbdeed35966081a6aa6c4c61945d.tar.gz
hdf5-c18db616e502fbdeed35966081a6aa6c4c61945d.tar.bz2
[svn-r19528] Add clear generated objects commands to test blocks.
Add configurefile command to copy CTestCustom to build folder. Bring r19527 back from trunk Tested: local linux
Diffstat (limited to 'hl')
-rw-r--r--hl/fortran/test/CMakeLists.txt14
-rw-r--r--hl/test/CMakeLists.txt27
2 files changed, 41 insertions, 0 deletions
diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt
index b4f4075..2968943 100644
--- 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)
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index 182fd14..22568ae 100644
--- 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")