diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-08-13 17:57:19 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-08-13 17:57:19 (GMT) |
| commit | aeb145428f5e6bc51742fff031b0cf8cf6fbefbb (patch) | |
| tree | d704d20286625755726d0800192e78ef60696226 /test | |
| parent | 60b62b10f1acbee14f6ec90d85922b8fefb0eeb4 (diff) | |
| parent | d95745235a468b17f697843adb3d0e54bd919893 (diff) | |
| download | hdf5-aeb145428f5e6bc51742fff031b0cf8cf6fbefbb.zip hdf5-aeb145428f5e6bc51742fff031b0cf8cf6fbefbb.tar.gz hdf5-aeb145428f5e6bc51742fff031b0cf8cf6fbefbb.tar.bz2 | |
Merge pull request #1860 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:map_api_merge to develop
* commit 'd95745235a468b17f697843adb3d0e54bd919893':
Updated h5trav.c to emit output that doesn't require ddl changes for map support.
Fixed Map API CMake option
Renamed H5Mdelete_key to H5Mdelete and H5Mset to H5Mput.
Added the map (H5M) API
Diffstat (limited to 'test')
| -rw-r--r-- | test/links.c | 6 | ||||
| -rw-r--r-- | test/objcopy.c | 11 | ||||
| -rw-r--r-- | test/tfile.c | 3 |
3 files changed, 19 insertions, 1 deletions
diff --git a/test/links.c b/test/links.c index f8be2b5..26b49d6 100644 --- a/test/links.c +++ b/test/links.c @@ -7108,6 +7108,9 @@ done: ret_value = -1; break; + case H5I_MAP: + /* TODO: Not supported in native file format yet */ + case H5I_UNINIT: case H5I_BADID: case H5I_FILE: @@ -7197,6 +7200,9 @@ done: ret_value = -1; break; + case H5I_MAP: + /* TODO: Not supported in native file format yet */ + case H5I_UNINIT: case H5I_BADID: case H5I_FILE: diff --git a/test/objcopy.c b/test/objcopy.c index 47a1065..489d6dd 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -1080,6 +1080,9 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, if(H5Tequal(obj1_id, obj2_id) != TRUE) TEST_ERROR break; + case H5O_TYPE_MAP: + /* Maps not supported in native VOL connector */ + case H5O_TYPE_UNKNOWN: case H5O_TYPE_NTYPES: default: @@ -1138,6 +1141,9 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, if(H5Tequal(obj1_id, obj2_id) != TRUE) TEST_ERROR break; + case H5O_TYPE_MAP: + /* Maps not supported in native VOL connector */ + case H5O_TYPE_UNKNOWN: case H5O_TYPE_NTYPES: default: @@ -1454,10 +1460,13 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) if(H5Tequal(oid, oid2) != TRUE) TEST_ERROR break; + case H5O_TYPE_MAP: + HDassert(0 && "maps not supported in native VOL connector"); + case H5O_TYPE_UNKNOWN: case H5O_TYPE_NTYPES: default: -HDassert(0 && "Unknown type of object"); + HDassert(0 && "Unknown type of object"); break; } /* end switch */ diff --git a/test/tfile.c b/test/tfile.c index 9e17c34..0fc391e 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -1434,6 +1434,9 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1, VERIFY(oid_list[i], did, "H5Fget_obj_ids"); break; + case H5I_MAP: + /* TODO: Not supported in native VOL connector yet */ + case H5I_UNINIT: case H5I_BADID: case H5I_DATATYPE: |