[svn-r20378] Purpose:

    Bug 2182 - h5ls and h5dump: update to use --enable-error-stack among tools, also update related descriptions

Description:
    Decided to use --enable-error-stack long option name only to 
    display error stack messages from HDF5 lib among tools.
    Updated to unify option name to '--enable-error-stack' for printing 
    HDF5 error stack messages for HDF5 tools. h5ls and h5dump for now.
    For h5ls, this replaces "-e/--errors" option, which is deprecated.
    For h5dump, remove -E from help page and RM , which was added by mistake
    before release1.8.7.
    Help page and RM got updated.
    Updated test case.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE)

6 files changed, 22 insertions, 6 deletions

diff --git a/tools/testfiles/help-1.ls b/tools/testfiles/help-1.ls
index 7f8879c..e15a88b 100644
--- a/tools/testfiles/help-1.ls
+++ b/tools/testfiles/help-1.ls
@@ -10,7 +10,8 @@ usage: h5ls [OPTIONS] [OBJECTS...]
                    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.
@@ -56,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 8bc31fb..7d035c0 100644
--- a/tools/testfiles/help-2.ls
+++ b/tools/testfiles/help-2.ls
@@ -10,7 +10,8 @@ usage: h5ls [OPTIONS] [OBJECTS...]
                    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.
@@ -56,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 29aed97..8de1003 100644
--- a/tools/testfiles/help-3.ls
+++ b/tools/testfiles/help-3.ls
@@ -10,7 +10,8 @@ usage: h5ls [OPTIONS] [OBJECTS...]
                    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.
@@ -56,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/textlinksrc-nodangle-1.ls b/tools/testfiles/textlinksrc-nodangle-1.ls
index 306c4f9..9240761 100644
--- a/tools/testfiles/textlinksrc-nodangle-1.ls
+++ b/tools/testfiles/textlinksrc-nodangle-1.ls
@@ -12,7 +12,8 @@ usage: h5ls [OPTIONS] [OBJECTS...]
                    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.
@@ -58,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 54c139c..04066ca 100644
--- a/tools/testfiles/tgroup-1.ls
+++ b/tools/testfiles/tgroup-1.ls
@@ -12,7 +12,8 @@ usage: h5ls [OPTIONS] [OBJECTS...]
                    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.
@@ -58,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 7845675..0e78217 100644
--- a/tools/testfiles/tnofilename.ddl
+++ b/tools/testfiles/tnofilename.ddl
@@ -35,7 +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
-     -E, --enable-error-stack   Show all HDF5 error reporting
+     --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.