diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-02-27 22:54:52 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-02-27 22:54:52 (GMT) |
| commit | 467b5d565cc6bb0a75f10ac0807c38ee0a0939a9 (patch) | |
| tree | c2d87fcc51f380a2306949753c40cebd9e9aa796 /tools/libtest | |
| parent | f1aca8780ea647e705760149ceb925e363c31763 (diff) | |
| download | hdf5-467b5d565cc6bb0a75f10ac0807c38ee0a0939a9.zip hdf5-467b5d565cc6bb0a75f10ac0807c38ee0a0939a9.tar.gz hdf5-467b5d565cc6bb0a75f10ac0807c38ee0a0939a9.tar.bz2 | |
Merge CMake and tools changes from develop
Diffstat (limited to 'tools/libtest')
| -rw-r--r-- | tools/libtest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/libtest/h5tools_test_utils.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/libtest/CMakeLists.txt b/tools/libtest/CMakeLists.txt index 5f53272..7246e66 100644 --- a/tools/libtest/CMakeLists.txt +++ b/tools/libtest/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.10) +cmake_minimum_required (VERSION 3.12) project (HDF5_TOOLS_LIBTEST C) #----------------------------------------------------------------------------- diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c index 120f803..726f4c4 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -1000,7 +1000,7 @@ test_set_configured_fapl(void) * TEST-LOCAL VARIABLES * ************************/ - hid_t fapl_id = -1; + hid_t fapl_id = H5I_INVALID_HID; other_fa_t wrong_fa = {0x432, 0xf82, 0x9093}; H5FD_ros3_fapl_t ros3_anon_fa = {1, FALSE, "", "", ""}; H5FD_ros3_fapl_t ros3_auth_fa = { @@ -1150,7 +1150,7 @@ test_set_configured_fapl(void) int result; testcase C = cases[i]; - fapl_id = -1; + fapl_id = H5I_INVALID_HID; #if UTIL_TEST_DEBUG HDfprintf(stderr, "setup test %d\t%s\n", i, C.message); fflush(stderr); @@ -1183,7 +1183,7 @@ test_set_configured_fapl(void) if (fapl_id > 0) { FAIL_IF( FAIL == H5Pclose(fapl_id) ) } - fapl_id = -1; + fapl_id = H5I_INVALID_HID; #if UTIL_TEST_DEBUG HDfprintf(stderr, "after cleanup\n"); fflush(stderr); |