summaryrefslogtreecommitdiffstats
path: root/hl/tools
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-03-26 19:00:27 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-03-26 19:00:34 (GMT)
commit6e2e4610878ccf3709fb2bb305bfd4eb11289ba5 (patch)
treebcfe42e86109b36e6699fecbac1344fa027023e3 /hl/tools
parentb530043b7a3dc29c56f567f090d1a6831330e46f (diff)
downloadhdf5-6e2e4610878ccf3709fb2bb305bfd4eb11289ba5.zip
hdf5-6e2e4610878ccf3709fb2bb305bfd4eb11289ba5.tar.gz
hdf5-6e2e4610878ccf3709fb2bb305bfd4eb11289ba5.tar.bz2
HDFFV-10741 - add option to skip tool error stack tests
Diffstat (limited to 'hl/tools')
-rw-r--r--hl/tools/h5watch/CMakeTests.cmake32
1 files changed, 20 insertions, 12 deletions
diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake
index a4d3fa2..d608f3a 100644
--- a/hl/tools/h5watch/CMakeTests.cmake
+++ b/hl/tools/h5watch/CMakeTests.cmake
@@ -88,18 +88,26 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
macro (ADD_H5_ERR_TEST resultfile resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
- add_test (
- NAME H5WATCH_ARGS-h5watch-${resultfile}
- COMMAND "${CMAKE_COMMAND}"
- -D "TEST_PROGRAM=$<TARGET_FILE:h5watch>"
- -D "TEST_ARGS:STRING=${ARGN}"
- -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
- -D "TEST_OUTPUT=${resultfile}.out"
- -D "TEST_EXPECT=${resultcode}"
- -D "TEST_REFERENCE=${resultfile}.mty"
- -D "TEST_ERRREF=${resultfile}.err"
- -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
- )
+ if (SKIP_ERROR_STACK_TESTS)
+ add_test (
+ NAME H5WATCH_ARGS-h5watch-${resultfile}
+ COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+ )
+ set_property(TEST H5WATCH_ARGS-h5watch-${resultfile} PROPERTY DISABLED)
+ else ()
+ add_test (
+ NAME H5WATCH_ARGS-h5watch-${resultfile}
+ COMMAND "${CMAKE_COMMAND}"
+ -D "TEST_PROGRAM=$<TARGET_FILE:h5watch>"
+ -D "TEST_ARGS:STRING=${ARGN}"
+ -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+ -D "TEST_OUTPUT=${resultfile}.out"
+ -D "TEST_EXPECT=${resultcode}"
+ -D "TEST_REFERENCE=${resultfile}.mty"
+ -D "TEST_ERRREF=${resultfile}.err"
+ -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+ )
+ endif ()
set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DEPENDS ${last_test})
set (last_test "H5WATCH_ARGS-h5watch-${resultfile}")
endif ()