diff options
| author | Jacob Smith <jake.smith@hdfgroup.org> | 2018-12-12 23:34:13 (GMT) |
|---|---|---|
| committer | Jacob Smith <jake.smith@hdfgroup.org> | 2018-12-12 23:34:13 (GMT) |
| commit | ad6de59e4c412545ade72269907c73fcdd85187e (patch) | |
| tree | a4784d5330fbb9356a84b5548cc503566ec18fac /test | |
| parent | 911b8e8fc21df6ace6b8132263101ac25019efe7 (diff) | |
| parent | afdf3094cc6577bacd004f2cb4b553b63bf503f7 (diff) | |
| download | hdf5-ad6de59e4c412545ade72269907c73fcdd85187e.zip hdf5-ad6de59e4c412545ade72269907c73fcdd85187e.tar.gz hdf5-ad6de59e4c412545ade72269907c73fcdd85187e.tar.bz2 | |
Merge branch 'develop' into dset_ohdr_minimize
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeTests.cmake | 4 | ||||
| -rw-r--r-- | test/tvlstr.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index d0b6de5..178c8e7 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -845,6 +845,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" @@ -879,6 +880,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" @@ -945,6 +947,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" @@ -979,6 +982,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" diff --git a/test/tvlstr.c b/test/tvlstr.c index 68d1070..da6195c 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -880,7 +880,7 @@ static void test_write_same_element(void) fspace = H5Screate_simple(SPACE1_RANK, fdim, NULL); CHECK(fspace, FAIL, "H5Screate_simple"); - dataset1 = H5Dcreate(file1, DATASET, dtype, fspace, H5P_DEFAULT, + dataset1 = H5Dcreate2(file1, DATASET, dtype, fspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); CHECK(dataset1, FAIL, "H5Dcreate"); @@ -905,7 +905,7 @@ static void test_write_same_element(void) file1 = H5Fopen(DATAFILE3, H5F_ACC_RDWR, H5P_DEFAULT); CHECK(file1, FAIL, "H5Fopen"); - dataset1 = H5Dopen(file1, DATASET, H5P_DEFAULT); + dataset1 = H5Dopen2(file1, DATASET, H5P_DEFAULT); CHECK(dataset1, FAIL, "H5Dopen"); fspace = H5Dget_space(dataset1); |