diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2021-05-07 18:05:02 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2021-05-07 18:05:02 (GMT) |
commit | d33f696dca83326884935d6ad1ee399fa21721a8 (patch) | |
tree | 93c6accf6acaa0e7ac5d158a4f38a4d0b631923f /test | |
parent | 7f58a89578b64df2b040d97294cb1cf2a82bebd3 (diff) | |
download | hdf5-d33f696dca83326884935d6ad1ee399fa21721a8.zip hdf5-d33f696dca83326884935d6ad1ee399fa21721a8.tar.gz hdf5-d33f696dca83326884935d6ad1ee399fa21721a8.tar.bz2 |
Brings hash table IDs from develop
Diffstat (limited to 'test')
-rw-r--r-- | test/tid.c | 4 | ||||
-rw-r--r-- | test/vol.c | 21 |
2 files changed, 14 insertions, 11 deletions
@@ -715,7 +715,7 @@ test_remove_clear_type(void) for (i = 0; i < RCT_NITER; i++) { /* The number of members in the type, according to the HDF5 library */ - hsize_t nmembers = 1234567; + hsize_t nmembers = 1234567; /* (init to fake number) */ /* The number of objects found while scanning through the object list */ int found; @@ -801,7 +801,7 @@ test_remove_clear_type(void) if (ret == FAIL) goto error; VERIFY(nmembers, found, "The number of members remaining in the type did not match our count"); - if (nmembers != found) + if (nmembers != (hsize_t)found) goto error; /***************************************** @@ -283,7 +283,6 @@ error: } H5E_END_TRY; return FAIL; - } /* end test_vol_registration() */ /*------------------------------------------------------------------------- @@ -387,8 +386,8 @@ test_basic_file_operation(const char *env_h5_drvr) TEST_ERROR; /* Can't compare VFD properties for split / multi / family VFDs */ - if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && - HDstrcmp(env_h5_drvr, "family"))) { + if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "family") != 0)) { /* H5Fget_access_plist */ if ((fapl_id2 = H5Fget_access_plist(fid)) < 0) TEST_ERROR; @@ -409,8 +408,8 @@ test_basic_file_operation(const char *env_h5_drvr) TEST_ERROR; /* Can't retrieve VFD handle for split / multi / family VFDs */ - if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && - HDstrcmp(env_h5_drvr, "family"))) { + if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "family") != 0)) { /* H5Fget_vfd_handle */ if (H5Fget_vfd_handle(fid, H5P_DEFAULT, &os_file_handle) < 0) TEST_ERROR; @@ -449,8 +448,8 @@ test_basic_file_operation(const char *env_h5_drvr) TEST_ERROR; /* Can't compare VFD properties for split / multi / family VFDs */ - if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && - HDstrcmp(env_h5_drvr, "family"))) { + if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "family") != 0)) { /* H5Fget_access_plist */ if ((fapl_id2 = H5Fget_access_plist(fid)) < 0) TEST_ERROR; @@ -464,8 +463,8 @@ test_basic_file_operation(const char *env_h5_drvr) TEST_ERROR; /* Can't compare VFD properties for split / multi / family VFDs */ - if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && - HDstrcmp(env_h5_drvr, "family"))) { + if ((hbool_t)(HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && + HDstrcmp(env_h5_drvr, "family") != 0)) { /* H5Fget_access_plist */ if ((fapl_id2 = H5Fget_access_plist(fid_reopen)) < 0) TEST_ERROR; @@ -938,10 +937,14 @@ test_basic_object_operation(void) if (H5Oget_info3(fid, &object_info, H5O_INFO_ALL) < 0) TEST_ERROR; + //! [H5Oget_info_by_name3_snip] + /* H5Oget_info_by_name */ if (H5Oget_info_by_name3(fid, NATIVE_VOL_TEST_GROUP_NAME, &object_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) TEST_ERROR; + //! [H5Oget_info_by_name3_snip] + /* H5Oexists_by_name */ if (H5Oexists_by_name(fid, NATIVE_VOL_TEST_GROUP_NAME, H5P_DEFAULT) != TRUE) TEST_ERROR; |