diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-08-24 13:08:25 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-08-24 13:08:25 (GMT) |
| commit | d1e1bee50921087fbb0a7feceed144c12040be1a (patch) | |
| tree | 11cec6c8e5aca44208bcb1dcf7dba6a3263bf798 | |
| parent | 2ab6012bc455571645d125eac60d59208eca4dd9 (diff) | |
| parent | e31653cf5f547d4d8baff7be40f3b1b69b1765c5 (diff) | |
| download | hdf5-d1e1bee50921087fbb0a7feceed144c12040be1a.zip hdf5-d1e1bee50921087fbb0a7feceed144c12040be1a.tar.gz hdf5-d1e1bee50921087fbb0a7feceed144c12040be1a.tar.bz2 | |
Merge pull request #2827 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to hdf5_1_12
* commit 'e31653cf5f547d4d8baff7be40f3b1b69b1765c5':
Revert H5_VERS_SUBRELEASE check
Add special case when H5_VERS_SUBRELEASE is 0
Condition if (H5_VERS_SUBRELEASE) is incorrectly false when H5_VERS_SUBRELEASE is 0, a valid value for H5_VERS_SUBRELEASE. Updated to if (${H5_VERS_SUBRELEASE} STREQUAL "") with corresponding reversal of action statements to avoid NOT.
Add hypen to subrelease regex
Add ifdef blocks to S3/HDFS test
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/libtest/h5tools_test_utils.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fb20b1b..934aeeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,7 +236,7 @@ string (REGEX REPLACE ".*#define[ \t]+H5_VERS_MINOR[ \t]+([0-9]*).*$" "\\1" H5_VERS_MINOR ${_h5public_h_contents}) string (REGEX REPLACE ".*#define[ \t]+H5_VERS_RELEASE[ \t]+([0-9]*).*$" "\\1" H5_VERS_RELEASE ${_h5public_h_contents}) -string (REGEX REPLACE ".*#define[ \t]+H5_VERS_SUBRELEASE[ \t]+\"([0-9A-Za-z._]*)\".*$" +string (REGEX REPLACE ".*#define[ \t]+H5_VERS_SUBRELEASE[ \t]+\"([0-9A-Za-z._\-]*)\".*$" "\\1" H5_VERS_SUBRELEASE ${_h5public_h_contents}) #message (STATUS "VERSION: ${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}-${H5_VERS_SUBRELEASE}") diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c index 12360a7..244fd43 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -1003,6 +1003,7 @@ test_set_configured_fapl(void) hid_t fapl_id = H5I_INVALID_HID; other_fa_t wrong_fa = {0x432, 0xf82, 0x9093}; +#ifdef H5_HAVE_ROS3_VFD H5FD_ros3_fapl_t ros3_anon_fa = {1, FALSE, "", "", ""}; H5FD_ros3_fapl_t ros3_auth_fa = { 1, /* fapl version */ @@ -1011,6 +1012,8 @@ test_set_configured_fapl(void) "12345677890abcdef", /* simulate access key ID */ "oiwnerwe9u0234nJw0-aoj+dsf", /* simulate secret key */ }; +#endif /* H5_HAVE_ROS3_VFD */ +#ifdef H5_HAVE_LIBHDFS H5FD_hdfs_fapl_t hdfs_fa = { 1, /* fapl version */ "", /* namenode name */ @@ -1019,6 +1022,7 @@ test_set_configured_fapl(void) "", /* user name */ 2048, /* stream buffer size */ }; +#endif /* H5_HAVE_LIBHDFS */ unsigned n_cases = 7; /* number of common testcases */ testcase cases[] = { { "(common) should fail: no fapl id", |