diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-04-15 14:46:29 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-04-15 19:46:23 (GMT) |
| commit | 68bddef35d2c84838fd9e769720bfb04875a629f (patch) | |
| tree | 05187d18c4203e8aa153e3e0a5d8d84564cf2044 /tools/test/h5jam | |
| parent | 4d224f4f19ec8bfe2ac17600e6ea7ca010807efb (diff) | |
| download | hdf5-68bddef35d2c84838fd9e769720bfb04875a629f.zip hdf5-68bddef35d2c84838fd9e769720bfb04875a629f.tar.gz hdf5-68bddef35d2c84838fd9e769720bfb04875a629f.tar.bz2 | |
HDFFV-10741 - remove SKIP_ERRSTK_TESTS option
Diffstat (limited to 'tools/test/h5jam')
| -rw-r--r-- | tools/test/h5jam/CMakeTests.cmake | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake index 6d328b5..677ba5c 100644 --- a/tools/test/h5jam/CMakeTests.cmake +++ b/tools/test/h5jam/CMakeTests.cmake @@ -66,27 +66,19 @@ ${expectfile}.out ${expectfile}.out.err ) - if (SKIP_ERROR_STACK_TESTS) - add_test ( - NAME H5JAM-${resultfile} - COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test" - ) - set_property(TEST H5JAM-${resultfile} PROPERTY DISABLED) - else () - add_test ( - NAME H5JAM-${expectfile} - COMMAND "${CMAKE_COMMAND}" - -D "TEST_PROGRAM=$<TARGET_FILE:h5jam>" - -D "TEST_ARGS:STRING=${ARGN}" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" - -D "TEST_OUTPUT=${expectfile}.out" - -D "TEST_EXPECT=${resultcode}" - -D "TEST_ERRREF=testfiles/${expectfile}.txt" - -D "TEST_SKIP_COMPARE=1" - -D "TEST_REFERENCE=testfiles/${expectfile}.txt" - -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" - ) - endif () + add_test ( + NAME H5JAM-${expectfile} + COMMAND "${CMAKE_COMMAND}" + -D "TEST_PROGRAM=$<TARGET_FILE:h5jam>" + -D "TEST_ARGS:STRING=${ARGN}" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" + -D "TEST_OUTPUT=${expectfile}.out" + -D "TEST_EXPECT=${resultcode}" + -D "TEST_ERRREF=testfiles/${expectfile}.txt" + -D "TEST_SKIP_COMPARE=1" + -D "TEST_REFERENCE=testfiles/${expectfile}.txt" + -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" + ) set_tests_properties (H5JAM-${expectfile} PROPERTIES DEPENDS "H5JAM-${expectfile}-clear-objects") endif () endmacro () |