[svn-r22571] HDFFV-7784,-8095,7936 merge from trunk

Tested: local linux with cmake

20 files changed, 154 insertions, 204 deletions

diff --git a/tools/testfiles/filter_fail.ddl b/tools/testfiles/filter_fail.ddl
index 1fc0506..3a456f5 100644
--- a/tools/testfiles/filter_fail.ddl
+++ b/tools/testfiles/filter_fail.ddl
@@ -8,24 +8,3 @@ GROUP "/" {
    }
 }
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dread(): can't read data
-    major: Dataset
-    minor: Read failed
-  #001: (file name) line (number) in H5D__read(): can't read data
-    major: Dataset
-    minor: Read failed
-  #002: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
-    major: Low-level I/O
-    minor: Read failed
-  #003: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
-    major: Data filters
-    minor: Filter operation failed
-  #004: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
-    major: Data filters
-    minor: Read failed
-h5dump error: unable to print data
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_dset(): H5Dread failed
-    major: Failure in tools library
-    minor: error in function
diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index d8551ca..43808e7 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl
index c0dd123..44ad6d0 100644
--- a/tools/testfiles/tattr-3.ddl
+++ b/tools/testfiles/tattr-3.ddl
@@ -6,11 +6,3 @@ ATTRIBUTE "/attr2" {
 ATTRIBUTE "/attr" {
 }
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Aopen(): unable to load attribute info from object header for attribute: 'attr'
-    major: Attribute
-    minor: Unable to initialize object
-  #001: (file name) line (number) in H5O_attr_open_by_name(): can't locate attribute: 'attr'
-    major: Attribute
-    minor: Object not found
-h5dump error: unable to open attribute "/attr"
diff --git a/tools/testfiles/tattrcontents1.ddl b/tools/testfiles/tattrcontents1.ddl
new file mode 100644
index 0000000..e118d89
--- /dev/null
+++ b/tools/testfiles/tattrcontents1.ddl
@@ -0,0 +1,21 @@
+HDF5 "tall.h5" {
+FILE_CONTENTS {
+ group      /
+ attribute  /attr1
+ attribute  /attr2
+ group      /g1
+ group      /g1/g1.1
+ dataset    /g1/g1.1/dset1.1.1
+ attribute  /g1/g1.1/dset1.1.1/attr1
+ attribute  /g1/g1.1/dset1.1.1/attr2
+ dataset    /g1/g1.1/dset1.1.2
+ group      /g1/g1.2
+ ext link   /g1/g1.2/extlink -> somefile somepath
+ group      /g1/g1.2/g1.2.1
+ link       /g1/g1.2/g1.2.1/slink -> somevalue
+ group      /g2
+ dataset    /g2/dset2.1
+ dataset    /g2/dset2.2
+ unknown type of UD link /g2/udlink -> ???
+ }
+}
diff --git a/tools/testfiles/tattrcontents2.ddl b/tools/testfiles/tattrcontents2.ddl
new file mode 100644
index 0000000..4076385
--- /dev/null
+++ b/tools/testfiles/tattrcontents2.ddl
@@ -0,0 +1,21 @@
+HDF5 "tall.h5" {
+FILE_CONTENTS {
+ group      /
+ attribute  /attr2
+ attribute  /attr1
+ group      /g2
+ unknown type of UD link /g2/udlink -> ???
+ dataset    /g2/dset2.2
+ dataset    /g2/dset2.1
+ group      /g1
+ group      /g1/g1.2
+ group      /g1/g1.2/g1.2.1
+ link       /g1/g1.2/g1.2.1/slink -> somevalue
+ ext link   /g1/g1.2/extlink -> somefile somepath
+ group      /g1/g1.1
+ dataset    /g1/g1.1/dset1.1.2
+ dataset    /g1/g1.1/dset1.1.1
+ attribute  /g1/g1.1/dset1.1.1/attr2
+ attribute  /g1/g1.1/dset1.1.1/attr1
+ }
+}
diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl
index 2034a43..dfda95e 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/testfiles/tdset-2.ddl
@@ -8,36 +8,3 @@ DATASET "/dset2" {
    DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) }
 }
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
-    major: Dataset
-    minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5G_loc_find_cb(): object 'dset3' doesn't exist
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info(): unable to get link info
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
-    major: Symbol table
-    minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
-    major: Symbol table
-    minor: Object not found
-h5dump error: unable to get link info from "dset3"
diff --git a/tools/testfiles/textlink.ddl b/tools/testfiles/textlink.ddl
index 4718adb..5459b30 100644
--- a/tools/testfiles/textlink.ddl
+++ b/tools/testfiles/textlink.ddl
@@ -10,53 +10,3 @@ GROUP "/" {
    }
 }
 }
-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 = 'filename', temp_file_name = 'filename'
-    major: Links
-    minor: Unable to open file
-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 = 'anotherfile', temp_file_name = 'anotherfile'
-    major: Links
-    minor: Unable to open file
diff --git a/tools/testfiles/tgroup-2.ddl b/tools/testfiles/tgroup-2.ddl
index c4af7bb..2ac8ac6 100644
--- a/tools/testfiles/tgroup-2.ddl
+++ b/tools/testfiles/tgroup-2.ddl
@@ -40,4 +40,3 @@ GROUP "/" {
 GROUP "/y" {
    }
 }
-h5dump error: unable to open group "/y"
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl
index 050a3a3..f74483f 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/tnofilename-with-packed-bits.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
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"
+   }
+}
+}
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl
index 5608d2b..31a386d 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/tpbitsIncomplete.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl
index f89b65f..b2ab900 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/tpbitsLengthExceeded.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index ba32aa6..2140ab7 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl
index 16f953d..598b2cd 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/tpbitsMaxExceeded.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl
index 446fe2d..a8192e9 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/tpbitsOffsetExceeded.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl
index 747cf99..60e31ec 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/tpbitsOffsetNegative.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
diff --git a/tools/testfiles/tperror.ddl b/tools/testfiles/tperror.ddl
index 16a7d8e..0cb961c 100644
--- a/tools/testfiles/tperror.ddl
+++ b/tools/testfiles/tperror.ddl
@@ -1,35 +1,2 @@
 HDF5 "tfcontents1.h5" {
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
-    major: Dataset
-    minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5G_loc_find_cb(): object 'bogus' doesn't exist
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info(): unable to get link info
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
-    major: Symbol table
-    minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
-    major: Symbol table
-    minor: Object not found
-h5dump error: unable to get link info from "bogus"
diff --git a/tools/testfiles/tqmarkfile.ddl b/tools/testfiles/tqmarkfile.ddl
index e7771cb..885be5f 100644
--- a/tools/testfiles/tqmarkfile.ddl
+++ b/tools/testfiles/tqmarkfile.ddl
@@ -48,36 +48,3 @@ DATASET "Dataset1" {
 }
 HDF5 "tarray8.h5" {
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
-    major: Dataset
-    minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5G_loc_find_cb(): object 'Dataset1' doesn't exist
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info(): unable to get link info
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
-    major: Symbol table
-    minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
-    major: Symbol table
-    minor: Object not found
-h5dump error: unable to get link info from "Dataset1"
diff --git a/tools/testfiles/tslink-D.ddl b/tools/testfiles/tslink-D.ddl
index a1d999a..9d90262 100644
--- a/tools/testfiles/tslink-D.ddl
+++ b/tools/testfiles/tslink-D.ddl
@@ -3,28 +3,3 @@ SOFTLINK "/slink1" {
    LINKTARGET "somevalue"
 }
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
-    major: Dataset
-    minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #004: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #005: (file name) line (number) in H5G_traverse_slink(): unable to follow symbolic link
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #007: (file name) line (number) in H5G_traverse_slink_cb(): component not found
-    major: Symbol table
-    minor: Object not found