diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-03-02 18:11:40 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-03-02 18:11:40 (GMT) |
| commit | 7cbf17a03f4131c65453e8d54bae0cc0737f8929 (patch) | |
| tree | 8ed25b6de6ff5227a47e6979f57444286aaf3712 /tools/h5diff | |
| parent | 718f16c86456ada744aac3e7e74ea40ae95f11da (diff) | |
| parent | db3936746f1175d07a754c345836a01c2c0128ef (diff) | |
| download | hdf5-7cbf17a03f4131c65453e8d54bae0cc0737f8929.zip hdf5-7cbf17a03f4131c65453e8d54bae0cc0737f8929.tar.gz hdf5-7cbf17a03f4131c65453e8d54bae0cc0737f8929.tar.bz2 | |
Merge pull request #322 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit 'db3936746f1175d07a754c345836a01c2c0128ef':
Remove non-applicable test
HDFFV-10120 verify nozlib checks and synchronize scripts with develop
Diffstat (limited to 'tools/h5diff')
| -rw-r--r-- | tools/h5diff/CMakeTests.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake index 91e0cab..a9ec683 100644 --- a/tools/h5diff/CMakeTests.cmake +++ b/tools/h5diff/CMakeTests.cmake @@ -335,13 +335,18 @@ -D "TEST_ARGS:STRING=${ARGN}" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/PAR/testfiles" -D "TEST_OUTPUT=${resultfile}.out" - -D "TEST_EXPECT=${resultcode}" + -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${resultfile}.txt" -# -D "TEST_APPEND=EXIT CODE: [0-9]" -# -D "TEST_REF_FILTER=EXIT CODE: 0" - -D "TEST_SKIP_COMPARE=TRUE" + -D "TEST_APPEND=EXIT CODE:" + -D "TEST_REF_APPEND=EXIT CODE: [0-9]" + -D "TEST_REF_FILTER=EXIT CODE: 0" + -D "TEST_SORT_COMPARE=TRUE" -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" ) + if (NOT "${last_test}" STREQUAL "") + set_tests_properties (PH5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test}) + endif () + set (last_test "PH5DIFF-${resultfile}") endif () ENDMACRO () |