summaryrefslogtreecommitdiffstats
path: root/tools/h5dump
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2011-03-31 22:31:20 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2011-03-31 22:31:20 (GMT)
commit183aaba8fcd4de8454853a59ab6256d33d67df8f (patch)
tree0d52002f40bfe134b7830cc40529ac1e97680cb1 /tools/h5dump
parent3d319b0ac1c837953bf6975b59d68e0f9bb666fd (diff)
downloadhdf5-183aaba8fcd4de8454853a59ab6256d33d67df8f.zip
hdf5-183aaba8fcd4de8454853a59ab6256d33d67df8f.tar.gz
hdf5-183aaba8fcd4de8454853a59ab6256d33d67df8f.tar.bz2
[svn-r20385] Purpose:
Bug 2182 - h5ls and h5dump: update to use --enable-error-stack among tools, also update related descriptions Description: Merged from HDF5 trunk r20378 and r20379 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)
Diffstat (limited to 'tools/h5dump')
-rw-r--r--tools/h5dump/h5dump.c3
-rw-r--r--tools/h5dump/testh5dump.sh.in2
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index def4f8c..55a3b2a 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -700,7 +700,8 @@ usage(const char *prog)
fprintf(stdout, " -X S, --xml-ns=S (XML Schema) Use qualified names n the XML\n");
fprintf(stdout, " \":\": no namespace, default: \"hdf5:\"\n");
fprintf(stdout, " E.g., to dump a file called `-f', use h5dump -- -f\n");
- fprintf(stdout, " -E, --enable-error-stack Show all HDF5 error reporting\n");
+ fprintf(stdout, " --enable-error-stack Prints messages from the HDF5 error stack as they\n");
+ fprintf(stdout, " occur.\n");
fprintf(stdout, "\n");
fprintf(stdout, " Subsetting is available by using the following options with a dataset\n");
fprintf(stdout, " attribute. Subsetting is done by selecting a hyperslab from the data.\n");
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 9ef41e8..b5b82db 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -637,7 +637,7 @@ TOOLTEST textlinkfar.ddl textlinkfar.h5
TOOLTEST textlink.ddl textlink.h5
# test for error stack display (BZ2048)
-TOOLTEST3 filter_fail.ddl -E filter_fail.h5
+TOOLTEST3 filter_fail.ddl --enable-error-stack filter_fail.h5
# test for -o -y for dataset with attributes
TOOLTEST tall-6.ddl -y -o data -d /g1/g1.1/dset1.1.1 tall.h5