diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2018-12-12 15:29:10 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2018-12-12 15:29:10 (GMT) |
commit | 8822bc3c4128ba4e134dfbb4e1ed2d942dad4cb4 (patch) | |
tree | 0917ab5bc2b5666bffc7209b85b5b571b806bb03 /test | |
parent | 1be974ff963e2e538090bb3e65ba66feb93d5c68 (diff) | |
parent | 139a12d13cda046fd3cd64a4f097eb3485f50173 (diff) | |
download | hdf5-8822bc3c4128ba4e134dfbb4e1ed2d942dad4cb4.zip hdf5-8822bc3c4128ba4e134dfbb4e1ed2d942dad4cb4.tar.gz hdf5-8822bc3c4128ba4e134dfbb4e1ed2d942dad4cb4.tar.bz2 |
Merge pull request #1349 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '139a12d13cda046fd3cd64a4f097eb3485f50173':
HDFFV-10632 correct number
HDFFV-10632 stder/stdout change note
Add stamp files for generated files
HDFFV-10632 update autotools test scripts to match cmake
HDFFV=10632 test cleanup
Fix special macro stdout as empty
Need nonexistent file to skip stdout compare
HDFFV-10632 - split stderr and stdout in cmake
Diffstat (limited to 'test')
-rw-r--r-- | test/CMakeTests.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 3ad9de7..1c26def 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -843,6 +843,7 @@ if (HDF5_ENABLE_DEPRECATED_SYMBOLS) -D "TEST_ARGS:STRING=" -D "TEST_EXPECT=0" -D "TEST_MASK_ERROR=true" + -D "ERROR_APPEND=1" -D "TEST_OUTPUT=err_compat.txt" -D "TEST_REFERENCE=err_compat_1" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST" @@ -877,6 +878,7 @@ else () -D "TEST_ARGS:STRING=" -D "TEST_EXPECT=0" -D "TEST_MASK_ERROR=true" + -D "ERROR_APPEND=1" -D "TEST_OUTPUT=error_test.txt" -D "TEST_REFERENCE=error_test_1" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST" @@ -943,6 +945,7 @@ if (BUILD_SHARED_LIBS) -D "TEST_ARGS:STRING=" -D "TEST_EXPECT=0" -D "TEST_MASK_ERROR=true" + -D "ERROR_APPEND=1" -D "TEST_OUTPUT=err_compat.txt" -D "TEST_REFERENCE=err_compat_1" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST-shared" @@ -977,6 +980,7 @@ if (BUILD_SHARED_LIBS) -D "TEST_ARGS:STRING=" -D "TEST_EXPECT=0" -D "TEST_MASK_ERROR=true" + -D "ERROR_APPEND=1" -D "TEST_OUTPUT=error_test.txt" -D "TEST_REFERENCE=error_test_1" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST-shared" |