philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r20616] Purpose:

Browse Source 
HDFFV-5948 - CHICAGO: Tools - implement missing external link test cases

Description:
    Merged from HDF5 trunk r20595 and r20600.
    Add three test cases for h5dump and h5ls.
    - h5ls: external link to soft link with follow symlink.
    - h5dump: external link to soft link with follow symlink.
    - h5ls: external link to soft link without follow symlink.

Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
This commit is contained in:
Jonathan Kim
2011-04-22 17:23:45 -05:00
parent 8116ae4f78
commit d0495e29cc
13 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/h5dump/CMakeLists.txt
View File

@@ -251,6 +251,7 @@ IF (BUILD_TESTING)
tdatareg.h5
tdset.h5
tempty.h5
tsoftlinks.h5
textlinkfar.h5
textlinksrc.h5
textlinktar.h5

5
tools/h5dump/h5dumpgentest.c
View File

@@ -6887,6 +6887,11 @@ gent_extlinks(void)
H5Lcreate_external(FILE62, "type", source_fid, "ext_link3", H5P_DEFAULT, H5P_DEFAULT);
H5Lcreate_external(FILE62, "group/elink_t2", source_fid, "ext_link4", H5P_DEFAULT, H5P_DEFAULT);
H5Lcreate_external(FILE62, "empty_group", source_fid, "ext_link5", H5P_DEFAULT, H5P_DEFAULT);
/* external link to soft link which linked to a dataset */
H5Lcreate_external(FILE4_1, "/soft_dset1", source_fid, "ext2soft_link1", H5P_DEFAULT, H5P_DEFAULT);
/* external link to dangle soft link */
H5Lcreate_external(FILE4_1, "/soft_dangle", source_fid, "ext2softdangle_link1", H5P_DEFAULT, H5P_DEFAULT);
/*-------------------------------------------------------------------------
* create external link in the "far" file pointing to the source file

18
tools/testfiles/textlinkfar.ddl
View File

@@ -7,6 +7,24 @@ GROUP "/" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
DATA {
(0,0): 0, 0,
(1,0): 1, 1,
(2,0): 2, 2,
(3,0): 3, 3
}
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"

4
tools/testfiles/textlinksrc-1-old.ls
View File

@@ -2,9 +2,13 @@
output for 'h5ls -w80 -Er textlinksrc.h5'
#############################
/ Group
/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}}
/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**}
/ext_link1 External Link {textlinktar.h5//group} {Group}
/ext_link1/dset Dataset {6}
/ext_link1/elink_t1 External Link {textlinksrc.h5//} {Group}
/ext_link1/elink_t1/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Already Visited}
/ext_link1/elink_t1/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {Already Visited}
/ext_link1/elink_t1/ext_link1 External Link {textlinktar.h5//group} {Already Visited}
/ext_link1/elink_t1/ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}}
/ext_link1/elink_t1/ext_link3 External Link {textlinktar.h5//type} {Type}

4
tools/testfiles/textlinksrc-1.ls
View File

@@ -2,9 +2,13 @@
output for 'h5ls -w80 --follow-symlinks -r textlinksrc.h5'
#############################
/ Group
/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}}
/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**}
/ext_link1 External Link {textlinktar.h5//group} {Group}
/ext_link1/dset Dataset {6}
/ext_link1/elink_t1 External Link {textlinksrc.h5//} {Group}
/ext_link1/elink_t1/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Already Visited}
/ext_link1/elink_t1/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {Already Visited}
/ext_link1/elink_t1/ext_link1 External Link {textlinktar.h5//group} {Already Visited}
/ext_link1/elink_t1/ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}}
/ext_link1/elink_t1/ext_link3 External Link {textlinktar.h5//type} {Type}

2
tools/testfiles/textlinksrc-3-old.ls
View File

@@ -4,6 +4,8 @@
ext_link1 External Link {textlinktar.h5//group} {Group}
/dset Dataset {6}
/elink_t1 External Link {textlinksrc.h5//} {Group}
/elink_t1/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}}
/elink_t1/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**}
/elink_t1/ext_link1 External Link {textlinktar.h5//group} {Already Visited}
/elink_t1/ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}}
/elink_t1/ext_link3 External Link {textlinktar.h5//type} {Type}

2
tools/testfiles/textlinksrc-3.ls
View File

@@ -4,6 +4,8 @@
ext_link1 External Link {textlinktar.h5//group} {Group}
/dset Dataset {6}
/elink_t1 External Link {textlinksrc.h5//} {Group}
/elink_t1/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}}
/elink_t1/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**}
/elink_t1/ext_link1 External Link {textlinktar.h5//group} {Already Visited}
/elink_t1/ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}}
/elink_t1/ext_link3 External Link {textlinktar.h5//type} {Type}

2
tools/testfiles/textlinksrc-4.ls
View File

@@ -2,6 +2,8 @@
output for 'h5ls -w80 -r textlinksrc.h5'
#############################
/ Group
/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1}
/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle}
/ext_link1 External Link {textlinktar.h5//group}
/ext_link2 External Link {textlinktar.h5//dset}
/ext_link3 External Link {textlinktar.h5//type}

2
tools/testfiles/textlinksrc-6-old.ls
View File

@@ -1,6 +1,8 @@
#############################
output for 'h5ls -w80 -E textlinksrc.h5'
#############################
ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}}
ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**}
ext_link1 External Link {textlinktar.h5//group} {Group}
ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}}
ext_link3 External Link {textlinktar.h5//type} {Type}

2
tools/testfiles/textlinksrc-6.ls
View File

@@ -1,6 +1,8 @@
#############################
output for 'h5ls -w80 --follow-symlinks textlinksrc.h5'
#############################
ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}}
ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**}
ext_link1 External Link {textlinktar.h5//group} {Group}
ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}}
ext_link3 External Link {textlinktar.h5//type} {Type}

2
tools/testfiles/textlinksrc-nodangle-2.ls
View File

@@ -1,6 +1,8 @@
#############################
output for 'h5ls -w80 --follow-symlinks --no-dangling-links textlinksrc.h5'
#############################
ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}}
ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**}
ext_link1 External Link {textlinktar.h5//group} {Group}
ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}}
ext_link3 External Link {textlinktar.h5//type} {Type}

18
tools/testfiles/textlinksrc.ddl
View File

@@ -3,6 +3,24 @@ Expected output for 'h5dump textlinksrc.h5'
#############################
HDF5 "textlinksrc.h5" {
GROUP "/" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
DATA {
(0,0): 0, 0,
(1,0): 1, 1,
(2,0): 2, 2,
(3,0): 3, 3
}
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"

BIN
tools/testfiles/textlinksrc.h5
View File

Binary file not shown.