[svn-r20383] Description:

    Bring r19714:20382 from trunk to revise_chunks branch

Tested:
    Linux 2.6/64 (chicago)

12 files changed, 112 insertions, 18 deletions

diff --git a/tools/testfiles/filter_fail.ddl b/tools/testfiles/filter_fail.ddl
new file mode 100644
index 0000000..354ac0f
--- /dev/null
+++ b/tools/testfiles/filter_fail.ddl
@@ -0,0 +1,30 @@
+#############################
+Expected output for 'h5dump --enable-error-stack filter_fail.h5'
+#############################
+HDF5 "filter_fail.h5" {
+GROUP "/" {
+   DATASET "dset_fail" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+      DATA {
+               }
+   }
+}
+}
+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 is not registered
+    major: Data filters
+    minor: Read failed
+h5dump error: unable to print data
diff --git a/tools/testfiles/filter_fail.h5 b/tools/testfiles/filter_fail.h5
new file mode 100644
index 0000000..c140a69
--- /dev/null
+++ b/tools/testfiles/filter_fail.h5
diff --git a/tools/testfiles/help-1.ls b/tools/testfiles/help-1.ls
index 6a2904e..e15a88b 100644
--- a/tools/testfiles/help-1.ls
+++ b/tools/testfiles/help-1.ls
@@ -4,9 +4,14 @@
 usage: h5ls [OPTIONS] [OBJECTS...]
   OPTIONS
    -h, -?, --help  Print a usage message and exit
-   -a, --address   Print addresses for raw data
+   -a, --address   Print raw data address.  If dataset is contiguous, address
+                   is offset in file of beginning of raw data. If chunked,
+                   returned list of addresses indicates offset of each chunk.
+                   Must be used with -v, --verbose option.
+                   Provides no information for non-dataset objects.
    -d, --data      Print the values of datasets
-   -e, --errors    Show all HDF5 error reporting
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
                    Follow symbolic links (soft links and external links)
                    to display target object information.
@@ -52,3 +57,5 @@ usage: h5ls [OPTIONS] [OBJECTS...]
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
+   -e, --errors       Show all HDF5 error reporting
+                      Replaced by --enable-error-stack.
diff --git a/tools/testfiles/help-2.ls b/tools/testfiles/help-2.ls
index 92163d1..7d035c0 100644
--- a/tools/testfiles/help-2.ls
+++ b/tools/testfiles/help-2.ls
@@ -4,9 +4,14 @@
 usage: h5ls [OPTIONS] [OBJECTS...]
   OPTIONS
    -h, -?, --help  Print a usage message and exit
-   -a, --address   Print addresses for raw data
+   -a, --address   Print raw data address.  If dataset is contiguous, address
+                   is offset in file of beginning of raw data. If chunked,
+                   returned list of addresses indicates offset of each chunk.
+                   Must be used with -v, --verbose option.
+                   Provides no information for non-dataset objects.
    -d, --data      Print the values of datasets
-   -e, --errors    Show all HDF5 error reporting
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
                    Follow symbolic links (soft links and external links)
                    to display target object information.
@@ -52,3 +57,5 @@ usage: h5ls [OPTIONS] [OBJECTS...]
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
+   -e, --errors       Show all HDF5 error reporting
+                      Replaced by --enable-error-stack.
diff --git a/tools/testfiles/help-3.ls b/tools/testfiles/help-3.ls
index 7199815..8de1003 100644
--- a/tools/testfiles/help-3.ls
+++ b/tools/testfiles/help-3.ls
@@ -4,9 +4,14 @@
 usage: h5ls [OPTIONS] [OBJECTS...]
   OPTIONS
    -h, -?, --help  Print a usage message and exit
-   -a, --address   Print addresses for raw data
+   -a, --address   Print raw data address.  If dataset is contiguous, address
+                   is offset in file of beginning of raw data. If chunked,
+                   returned list of addresses indicates offset of each chunk.
+                   Must be used with -v, --verbose option.
+                   Provides no information for non-dataset objects.
    -d, --data      Print the values of datasets
-   -e, --errors    Show all HDF5 error reporting
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
                    Follow symbolic links (soft links and external links)
                    to display target object information.
@@ -52,3 +57,5 @@ usage: h5ls [OPTIONS] [OBJECTS...]
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
+   -e, --errors       Show all HDF5 error reporting
+                      Replaced by --enable-error-stack.
diff --git a/tools/testfiles/tall-6.ddl b/tools/testfiles/tall-6.ddl
new file mode 100644
index 0000000..199c7f3
--- /dev/null
+++ b/tools/testfiles/tall-6.ddl
@@ -0,0 +1,27 @@
+#############################
+Expected output for 'h5dump -y -o data -d /g1/g1.1/dset1.1.1 tall.h5'
+#############################
+HDF5 "tall.h5" {
+DATASET "/g1/g1.1/dset1.1.1" {
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+   DATA {
+   }
+   ATTRIBUTE "attr1" {
+      DATATYPE  H5T_STD_I8BE
+      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
+      DATA {
+         49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111,
+         102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
+      }
+   }
+   ATTRIBUTE "attr2" {
+      DATATYPE  H5T_STD_I8BE
+      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
+      DATA {
+         50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111,
+         102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tattrreg.ddl b/tools/testfiles/tattrreg.ddl
index 5b64b18..989daf7 100644
--- a/tools/testfiles/tattrreg.ddl
+++ b/tools/testfiles/tattrreg.ddl
@@ -9,7 +9,7 @@ GROUP "/" {
       DATA {
       }
       ATTRIBUTE "Attribute1" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
          DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
          DATA {
          (0): DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9),
diff --git a/tools/testfiles/tdatareg.ddl b/tools/testfiles/tdatareg.ddl
index ea85fb9..d68401f 100644
--- a/tools/testfiles/tdatareg.ddl
+++ b/tools/testfiles/tdatareg.ddl
@@ -4,7 +4,7 @@ Expected output for 'h5dump tdatareg.h5'
 HDF5 "tdatareg.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
-      DATATYPE  H5T_REFERENCE
+      DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
       DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9), (2,2),
diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/testfiles/textlinksrc-nodangle-1.ls
index 8a6144b..9240761 100644
--- a/tools/testfiles/textlinksrc-nodangle-1.ls
+++ b/tools/testfiles/textlinksrc-nodangle-1.ls
@@ -6,9 +6,14 @@ Error: --no-dangling-links must be used along with --follow-symlinks option!
 usage: h5ls [OPTIONS] [OBJECTS...]
   OPTIONS
    -h, -?, --help  Print a usage message and exit
-   -a, --address   Print addresses for raw data
+   -a, --address   Print raw data address.  If dataset is contiguous, address
+                   is offset in file of beginning of raw data. If chunked,
+                   returned list of addresses indicates offset of each chunk.
+                   Must be used with -v, --verbose option.
+                   Provides no information for non-dataset objects.
    -d, --data      Print the values of datasets
-   -e, --errors    Show all HDF5 error reporting
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
                    Follow symbolic links (soft links and external links)
                    to display target object information.
@@ -54,3 +59,5 @@ usage: h5ls [OPTIONS] [OBJECTS...]
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
+   -e, --errors       Show all HDF5 error reporting
+                      Replaced by --enable-error-stack.
diff --git a/tools/testfiles/tgroup-1.ls b/tools/testfiles/tgroup-1.ls
index 03a70fd..04066ca 100644
--- a/tools/testfiles/tgroup-1.ls
+++ b/tools/testfiles/tgroup-1.ls
@@ -6,9 +6,14 @@ Error: 'recursive' option not compatible with 'group info' option!
 usage: h5ls [OPTIONS] [OBJECTS...]
   OPTIONS
    -h, -?, --help  Print a usage message and exit
-   -a, --address   Print addresses for raw data
+   -a, --address   Print raw data address.  If dataset is contiguous, address
+                   is offset in file of beginning of raw data. If chunked,
+                   returned list of addresses indicates offset of each chunk.
+                   Must be used with -v, --verbose option.
+                   Provides no information for non-dataset objects.
    -d, --data      Print the values of datasets
-   -e, --errors    Show all HDF5 error reporting
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
                    Follow symbolic links (soft links and external links)
                    to display target object information.
@@ -54,3 +59,5 @@ usage: h5ls [OPTIONS] [OBJECTS...]
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
+   -e, --errors       Show all HDF5 error reporting
+                      Replaced by --enable-error-stack.
diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl
index 5b9299b..0e78217 100644
--- a/tools/testfiles/tnofilename.ddl
+++ b/tools/testfiles/tnofilename.ddl
@@ -35,6 +35,8 @@ usage: h5dump [OPTIONS] file
      -X S, --xml-ns=S      (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
diff --git a/tools/testfiles/treference.ddl b/tools/testfiles/treference.ddl
index b34fa8d..b94802f 100644
--- a/tools/testfiles/treference.ddl
+++ b/tools/testfiles/treference.ddl
@@ -853,14 +853,14 @@ GROUP "/" {
          }
       }
       ATTRIBUTE "reference" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
          DATA {
          (0): DATASET 976 /dset , DATASET 976 /dset 
          }
       }
       ATTRIBUTE "reference2D" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
          DATA {
          (0,0): DATASET 976 /dset , DATASET 976 /dset ,
@@ -869,7 +869,7 @@ GROUP "/" {
          }
       }
       ATTRIBUTE "reference3D" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
          DATA {
          (0,0,0): DATASET 976 /dset , DATASET 976 /dset ,
@@ -1817,14 +1817,14 @@ GROUP "/" {
          }
       }
       DATASET "reference" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
          DATA {
          (0): DATASET 976 /dset , DATASET 976 /dset 
          }
       }
       DATASET "reference2D" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
          DATA {
          (0,0): DATASET 976 /dset , DATASET 976 /dset ,
@@ -1833,7 +1833,7 @@ GROUP "/" {
          }
       }
       DATASET "reference3D" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
          DATA {
          (0,0,0): DATASET 976 /dset , DATASET 976 /dset ,