summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-07-12 15:40:15 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-07-12 15:40:15 (GMT)
commit6e0eb24b7bc48bea6c12e221e4b8416d3bb08f06 (patch)
tree1b0b03e2ac170d6193704470d9d0f4a73a9b8bb7
parentb54b3fcf290d532de381e135254dfc343d338d24 (diff)
downloadhdf5-6e0eb24b7bc48bea6c12e221e4b8416d3bb08f06.zip
hdf5-6e0eb24b7bc48bea6c12e221e4b8416d3bb08f06.tar.gz
hdf5-6e0eb24b7bc48bea6c12e221e4b8416d3bb08f06.tar.bz2
[svn-r22564] HDFFV-8095: index order of links wrong
Create setters for indexing options in h5trav.c to be set before the obj table is created. Revert h5trav_print to remove now duplicated parameters. Added test and testfiles. Tested: local linux with cmake
-rw-r--r--tools/h5dump/errfiles/torderlinks1.err25
-rw-r--r--tools/h5dump/errfiles/torderlinks2.err25
-rw-r--r--tools/testfiles/torderlinks1.ddl52
-rw-r--r--tools/testfiles/torderlinks2.ddl52
4 files changed, 154 insertions, 0 deletions
diff --git a/tools/h5dump/errfiles/torderlinks1.err b/tools/h5dump/errfiles/torderlinks1.err
new file mode 100644
index 0000000..780c7e6
--- /dev/null
+++ b/tools/h5dump/errfiles/torderlinks1.err
@@ -0,0 +1,25 @@
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+ #000: (file name) line (number) in H5Oopen(): unable to open object
+ major: Symbol table
+ minor: Can't open object
+ #001: (file name) line (number) in H5O_open_name(): object not found
+ major: Symbol table
+ minor: Object not found
+ #002: (file name) line (number) in H5G_loc_find(): can't find object
+ major: Symbol table
+ minor: Object not found
+ #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+ major: Symbol table
+ minor: Object not found
+ #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+ major: Links
+ minor: Link traversal failure
+ #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+ major: Links
+ minor: Link traversal failure
+ #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+ major: Symbol table
+ minor: Unable to find atom information (already closed?)
+ #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'fname', temp_file_name = 'fname'
+ major: Links
+ minor: Unable to open file
diff --git a/tools/h5dump/errfiles/torderlinks2.err b/tools/h5dump/errfiles/torderlinks2.err
new file mode 100644
index 0000000..780c7e6
--- /dev/null
+++ b/tools/h5dump/errfiles/torderlinks2.err
@@ -0,0 +1,25 @@
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+ #000: (file name) line (number) in H5Oopen(): unable to open object
+ major: Symbol table
+ minor: Can't open object
+ #001: (file name) line (number) in H5O_open_name(): object not found
+ major: Symbol table
+ minor: Object not found
+ #002: (file name) line (number) in H5G_loc_find(): can't find object
+ major: Symbol table
+ minor: Object not found
+ #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+ major: Symbol table
+ minor: Object not found
+ #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+ major: Links
+ minor: Link traversal failure
+ #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+ major: Links
+ minor: Link traversal failure
+ #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+ major: Symbol table
+ minor: Unable to find atom information (already closed?)
+ #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'fname', temp_file_name = 'fname'
+ major: Links
+ minor: Unable to open file
diff --git a/tools/testfiles/torderlinks1.ddl b/tools/testfiles/torderlinks1.ddl
new file mode 100644
index 0000000..eaf6eea
--- /dev/null
+++ b/tools/testfiles/torderlinks1.ddl
@@ -0,0 +1,52 @@
+HDF5 "tfcontents1.h5" {
+GROUP "/" {
+ DATATYPE "#5616" H5T_STD_I32BE;
+ DATASET "dset" {
+ DATATYPE H5T_STD_I32BE
+ DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
+ DATA {
+ (0): 1, 2, 3, 4
+ }
+ }
+ DATASET "dset3" {
+ HARDLINK "/dset"
+ }
+ DATASET "dset4" {
+ HARDLINK "/dset"
+ }
+ DATASET "dsetmytype2" {
+ DATATYPE "/#5616"
+ DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
+ DATA {
+ (0): 1, 2, 3, 4
+ }
+ }
+ EXTERNAL_LINK "extlink" {
+ TARGETFILE "fname"
+ TARGETPATH "oname"
+ }
+ GROUP "g1" {
+ DATASET "dset1" {
+ HARDLINK "/dset"
+ }
+ GROUP "g1.1" {
+ DATASET "dset2" {
+ HARDLINK "/dset"
+ }
+ }
+ }
+ GROUP "g2" {
+ HARDLINK "/g1/g1.1"
+ }
+ SOFTLINK "mylink" {
+ LINKTARGET "mylink"
+ }
+ DATATYPE "mytype" H5T_STD_I32BE;
+ SOFTLINK "softlink" {
+ LINKTARGET "/dset"
+ }
+ USERDEFINED_LINK "udlink" {
+ LINKCLASS 187
+ }
+}
+}
diff --git a/tools/testfiles/torderlinks2.ddl b/tools/testfiles/torderlinks2.ddl
new file mode 100644
index 0000000..dd68208
--- /dev/null
+++ b/tools/testfiles/torderlinks2.ddl
@@ -0,0 +1,52 @@
+HDF5 "tfcontents1.h5" {
+GROUP "/" {
+ DATATYPE "#5616" H5T_STD_I32BE;
+ USERDEFINED_LINK "udlink" {
+ LINKCLASS 187
+ }
+ SOFTLINK "softlink" {
+ LINKTARGET "/dset"
+ }
+ DATATYPE "mytype" H5T_STD_I32BE;
+ SOFTLINK "mylink" {
+ LINKTARGET "mylink"
+ }
+ GROUP "g2" {
+ DATASET "dset2" {
+ DATATYPE H5T_STD_I32BE
+ DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
+ DATA {
+ (0): 1, 2, 3, 4
+ }
+ }
+ }
+ GROUP "g1" {
+ GROUP "g1.1" {
+ HARDLINK "/g2"
+ }
+ DATASET "dset1" {
+ HARDLINK "/g2/dset2"
+ }
+ }
+ EXTERNAL_LINK "extlink" {
+ TARGETFILE "fname"
+ TARGETPATH "oname"
+ }
+ DATASET "dsetmytype2" {
+ DATATYPE "/#5616"
+ DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
+ DATA {
+ (0): 1, 2, 3, 4
+ }
+ }
+ DATASET "dset4" {
+ HARDLINK "/g2/dset2"
+ }
+ DATASET "dset3" {
+ HARDLINK "/g2/dset2"
+ }
+ DATASET "dset" {
+ HARDLINK "/g2/dset2"
+ }
+}
+}