summaryrefslogtreecommitdiffstats
path: root/c++/test/CMakeTests.cmake
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 /c++/test/CMakeTests.cmake
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 'c++/test/CMakeTests.cmake')
-rw-r--r--c++/test/CMakeTests.cmake25
1 files changed, 25 insertions, 0 deletions
diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake
index f2a10e2..3e4f6d9 100644
--- a/c++/test/CMakeTests.cmake
+++ b/c++/test/CMakeTests.cmake
@@ -4,8 +4,21 @@
### T E S T I N G ###
##############################################################################
##############################################################################
+# Remove any output file left over from previous test run
+ADD_TEST (
+ NAME cpp_testhdf5-clear-objects
+ COMMAND ${CMAKE_COMMAND}
+ -E remove
+ tattr_basic.h5
+ tattr_compound.h5
+ tattr_dtype.h5
+ tattr_multi.h5
+ tattr_scalar.h5
+ tfattrs.h5
+)
ADD_TEST (NAME cpp_testhdf5 COMMAND $<TARGET_FILE:cpp_testhdf5>)
+SET_TESTS_PROPERTIES (cpp_testhdf5 PROPERTIES DEPENDS cpp_testhdf5-clear-objects)
IF (HDF5_TEST_VFD)
@@ -25,6 +38,17 @@ IF (HDF5_TEST_VFD)
MACRO (ADD_VFD_TEST vfdname resultcode)
IF (NOT HDF5_ENABLE_USING_MEMCHECKER)
ADD_TEST (
+ NAME VFD-${vfdname}-cpp_testhdf5-clear-objects
+ COMMAND ${CMAKE_COMMAND}
+ -E remove
+ tattr_basic.h5
+ tattr_compound.h5
+ tattr_dtype.h5
+ tattr_multi.h5
+ tattr_scalar.h5
+ tfattrs.h5
+ )
+ ADD_TEST (
NAME VFD-${vfdname}-cpp_testhdf5
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
@@ -35,6 +59,7 @@ IF (HDF5_TEST_VFD)
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF5_RESOURCES_DIR}/vfdTest.cmake"
)
+ SET_TESTS_PROPERTIES (VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS VFD-${vfdname}-cpp_testhdf5-clear-objects)
ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER)
ENDMACRO (ADD_VFD_TEST)