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/h5ls/CMakeTests.cmake | |
| 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/h5ls/CMakeTests.cmake')
| -rw-r--r-- | tools/test/h5ls/CMakeTests.cmake | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index 2fbffe6..95af5ab 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -189,26 +189,18 @@ testfiles/${resultfile}.out testfiles/${resultfile}.out.err ) - if (SKIP_ERROR_STACK_TESTS) - add_test ( - NAME HH5LS-${resultfile} - COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test" - ) - set_property(TEST H5LS-${resultfile} PROPERTY DISABLED) - else () - add_test ( - NAME H5LS-${resultfile} - COMMAND "${CMAKE_COMMAND}" - -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>" - -D "TEST_ARGS=${ARGN}" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" - -D "TEST_OUTPUT=${resultfile}.out" - -D "TEST_EXPECT=${resultcode}" - -D "TEST_REFERENCE=${resultfile}.ls" - -D "TEST_ERRREF=${resultfile}.err" - -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" - ) - endif () + add_test ( + NAME H5LS-${resultfile} + COMMAND "${CMAKE_COMMAND}" + -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>" + -D "TEST_ARGS=${ARGN}" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" + -D "TEST_OUTPUT=${resultfile}.out" + -D "TEST_EXPECT=${resultcode}" + -D "TEST_REFERENCE=${resultfile}.ls" + -D "TEST_ERRREF=${resultfile}.err" + -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" + ) set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects) endif () endmacro () |