diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2021-06-28 16:33:37 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2021-06-28 16:33:37 (GMT) |
| commit | 851be6f4ec7e7022357a476f30d36757a4579662 (patch) | |
| tree | 08002680d2057f9ed3dba9bc2528c3b8bea06219 /hl | |
| parent | 6dd051101d94b14ff21469b8045c4c26e2a446bd (diff) | |
| download | hdf5-851be6f4ec7e7022357a476f30d36757a4579662.zip hdf5-851be6f4ec7e7022357a476f30d36757a4579662.tar.gz hdf5-851be6f4ec7e7022357a476f30d36757a4579662.tar.bz2 | |
Most changes for fixing post open issues
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/test/h5hltest.h | 3 | ||||
| -rw-r--r-- | hl/test/test_lite.c | 36 |
2 files changed, 23 insertions, 16 deletions
diff --git a/hl/test/h5hltest.h b/hl/test/h5hltest.h index 14f3e14..f1d7aa9 100644 --- a/hl/test/h5hltest.h +++ b/hl/test/h5hltest.h @@ -27,6 +27,9 @@ /* Include the High-Level private header */ #include "H5HLprivate2.h" +/* Include library private headers needed for testing */ +#include "H5VLprivate.h" + /* Macros used in HL tests */ #define HL_TESTING2(WHAT) \ { \ diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c index cae91ff..e2f072d 100644 --- a/hl/test/test_lite.c +++ b/hl/test/test_lite.c @@ -1883,6 +1883,7 @@ test_valid_path(void) { hid_t file_id, group; htri_t path_valid; + hbool_t is_native; const char *data_string_in = "test"; HL_TESTING2("H5LTpath_valid"); @@ -1919,6 +1920,11 @@ test_valid_path(void) * ****************************************************************/ + /* Check for operating with native (only) VOL connector */ + is_native = FALSE; + if (H5VL_fapl_is_native(H5P_DEFAULT, &is_native) < 0) + goto out; + file_id = H5Fcreate(FILE_NAME3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); /* @@ -2069,17 +2075,14 @@ test_valid_path(void) * CHECK ABSOLUTE PATHS **************************************/ - if ((path_valid = H5LTpath_valid(file_id, "/", TRUE)) != TRUE) { + if ((path_valid = H5LTpath_valid(file_id, "/", TRUE)) != TRUE) goto out; - } - if ((path_valid = H5LTpath_valid(file_id, "/", FALSE)) != TRUE) { + if ((path_valid = H5LTpath_valid(file_id, "/", FALSE)) != TRUE) goto out; - } - if ((path_valid = H5LTpath_valid(file_id, "/G1", TRUE)) != TRUE) { + if ((path_valid = H5LTpath_valid(file_id, "/G1", TRUE)) != TRUE) goto out; - } if ((path_valid = H5LTpath_valid(file_id, "/G1/DS1", TRUE)) != TRUE) goto out; @@ -2126,13 +2129,11 @@ test_valid_path(void) if ((group = H5Gopen2(file_id, "/", H5P_DEFAULT)) < 0) goto out; - if ((path_valid = H5LTpath_valid(group, "/", TRUE)) != TRUE) { + if ((path_valid = H5LTpath_valid(group, "/", TRUE)) != TRUE) goto out; - } - if ((path_valid = H5LTpath_valid(group, "/", FALSE)) != TRUE) { + if ((path_valid = H5LTpath_valid(group, "/", FALSE)) != TRUE) goto out; - } if (H5Gclose(group) < 0) goto out; @@ -2195,17 +2196,20 @@ test_valid_path(void) if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink", FALSE)) != TRUE) goto out; - if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink", TRUE)) != TRUE) - goto out; + if (is_native) { + if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink", TRUE)) != TRUE) + goto out; - if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/G2/G6/ExternalLink/DS1", TRUE)) != TRUE) - goto out; + if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/G2/G6/ExternalLink/DS1", TRUE)) != TRUE) + goto out; + } if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/Gcyc/G2/G6/ExternalLink/G20", FALSE)) != TRUE) goto out; - if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink/DS1", TRUE)) != TRUE) - goto out; + if (is_native) + if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink/DS1", TRUE)) != TRUE) + goto out; if ((path_valid = H5LTpath_valid(file_id, "/G1/G2/G6/ExternalLink/G20", FALSE)) != TRUE) goto out; |