summaryrefslogtreecommitdiffstats
path: root/tools/test/h5format_convert/CMakeTests.cmake
diff options
context:
space:
mode:
authorVailin Choi <vchoi@jam.ad.hdfgroup.org>2017-10-17 16:48:26 (GMT)
committerVailin Choi <vchoi@jam.ad.hdfgroup.org>2017-10-17 16:50:46 (GMT)
commita7ba8af0d145fee16a758ae4150316c7f2a38263 (patch)
tree1e904f5bb6ae6413e481f3d4899329e2de91eb58 /tools/test/h5format_convert/CMakeTests.cmake
parentfe70476a225d2e0576149e0f1bdf95689f922c77 (diff)
parent0c207cd2f84021526690bcbc4e0a8a49ea4cb8a4 (diff)
downloadhdf5-a7ba8af0d145fee16a758ae4150316c7f2a38263.zip
hdf5-a7ba8af0d145fee16a758ae4150316c7f2a38263.tar.gz
hdf5-a7ba8af0d145fee16a758ae4150316c7f2a38263.tar.bz2
Merge branch 'develop' into bugfix/version_bounds
Diffstat (limited to 'tools/test/h5format_convert/CMakeTests.cmake')
-rw-r--r--tools/test/h5format_convert/CMakeTests.cmake24
1 files changed, 19 insertions, 5 deletions
diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake
index 3e423da..4af220b 100644
--- a/tools/test/h5format_convert/CMakeTests.cmake
+++ b/tools/test/h5format_convert/CMakeTests.cmake
@@ -94,7 +94,10 @@
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
- -E remove ./testfiles/outtmp.h5
+ -E remove
+ ./testfiles/outtmp.h5
+ ./testfiles/${testname}.out
+ ./testfiles/${testname}.out.err
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -143,7 +146,10 @@
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
- -E remove ./testfiles/tmp.h5
+ -E remove
+ ./testfiles/tmp.h5
+ ./testfiles/${testname}.out
+ ./testfiles/${testname}.out.err
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -187,7 +193,10 @@
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
- -E remove ./testfiles/chktmp.h5
+ -E remove
+ ./testfiles/chktmp.h5
+ ./testfiles/${testname}.out
+ ./testfiles/${testname}.out.err
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -225,7 +234,12 @@
add_test (
NAME H5FC-${testname}-clear-objects
COMMAND ${CMAKE_COMMAND}
- -E remove ./testfiles/dmptmp.h5
+ -E remove
+ ./testfiles/dmptmp.h5
+ ./testfiles/${testname}.out
+ ./testfiles/${testname}.out.err
+ ./testfiles/${testname}_chk.out
+ ./testfiles/${testname}_chk.out.err
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -254,7 +268,7 @@
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-D "TEST_ARGS:STRING=-BH;./testfiles/dmptmp.h5"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
- -D "TEST_OUTPUT=testfiles/${testname}.out"
+ -D "TEST_OUTPUT=testfiles/${testname}_chk.out"
-D "TEST_EXPECT=0"
-D "TEST_REFERENCE=testfiles/${testname}.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"