summaryrefslogtreecommitdiffstats
path: root/test/mount.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-11-04 04:35:54 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-11-04 04:35:54 (GMT)
commitd60efe333661ab0c3a3bc0b7bbb46fc33f16a5ec (patch)
treea1245e42178484ac2f4ad50a3e9f35b8c93bf371 /test/mount.c
parent5a77933fd554cb0fa5672c4788eea43ef2162742 (diff)
downloadhdf5-d60efe333661ab0c3a3bc0b7bbb46fc33f16a5ec.zip
hdf5-d60efe333661ab0c3a3bc0b7bbb46fc33f16a5ec.tar.gz
hdf5-d60efe333661ab0c3a3bc0b7bbb46fc33f16a5ec.tar.bz2
[svn-r12860] Description:
Update H5Iget_name() tests to reflect that the name of the object for an ID can be found in many more situations now. Tested on: FreeBSD/32 4.11 (sleipnir)
Diffstat (limited to 'test/mount.c')
-rw-r--r--test/mount.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/mount.c b/test/mount.c
index af59240..e8a9503 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -1438,14 +1438,14 @@ test_mount_after_unmount(hid_t fapl)
TEST_ERROR
/* Unmount second file */
- if (H5Funmount(fid1, "/A/M")<0)
+ if(H5Funmount(fid1, "/A/M")<0)
TEST_ERROR
/* Check name */
*objname = '\0';
if(H5Iget_name( gidAMXMY, objname, (size_t)NAME_BUF_SIZE ) < 0)
TEST_ERROR
- if(HDstrcmp(objname, ""))
+ if(HDstrcmp(objname, "/X/M/Y"))
TEST_ERROR
/* Rename object in file #3 that is "disconnected" from name hiearchy */
@@ -1465,7 +1465,7 @@ test_mount_after_unmount(hid_t fapl)
*objname = '\0';
if(H5Iget_name( gidAMXMY, objname, (size_t)NAME_BUF_SIZE ) < 0)
TEST_ERROR
- if(HDstrcmp(objname, ""))
+ if(HDstrcmp(objname, "/X/M/Z"))
TEST_ERROR
/* Mount fourth file */
@@ -3173,10 +3173,10 @@ test_close_parent(hid_t fapl)
if(H5Funmount(gidM, "/A") < 0)
TEST_ERROR
- /* Check the name of "M" is not defined any longer */
+ /* Check the name of "M" is defined in its file */
if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
TEST_ERROR
- if(name_len != 0)
+ if(name_len == 0 || HDstrcmp(name, "/M"))
TEST_ERROR
/* Just file #2's underlying shared file should be open still */
@@ -3547,10 +3547,10 @@ test_cut_graph(hid_t fapl)
if(H5Gclose(gidO) < 0)
TEST_ERROR
- /* Check the name of "M" is not defined any longer */
+ /* Check the name of "M" is defined in its file */
if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
TEST_ERROR
- if(name_len != 0)
+ if(name_len == 0 || HDstrcmp(name, "/E/M"))
TEST_ERROR
/* Check the name of "Q" is still defined */
@@ -3580,10 +3580,10 @@ test_cut_graph(hid_t fapl)
if(H5F_sfile_assert_num(3) != 0)
TEST_ERROR
- /* Check the name of "Q" is not defined any longer */
+ /* Check the name of "Q" is defined in its file */
if((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE )) < 0)
TEST_ERROR
- if(name_len != 0)
+ if(name_len == 0 || HDstrcmp(name, "/I/Q"))
TEST_ERROR
/* Open object in file #6 from file #7 */