diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2009-12-26 08:36:37 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2009-12-26 08:36:37 (GMT) |
| commit | f40a245ce239b9597efa815d70d1d9f005fbafdc (patch) | |
| tree | d80f84b7a067f8ef634f0839d2d135d487d3e5eb /tools/h5dump | |
| parent | 840e04ab5f5ce7fa5d07a3c9187944c27f9534e9 (diff) | |
| download | hdf5-f40a245ce239b9597efa815d70d1d9f005fbafdc.zip hdf5-f40a245ce239b9597efa815d70d1d9f005fbafdc.tar.gz hdf5-f40a245ce239b9597efa815d70d1d9f005fbafdc.tar.bz2 | |
[svn-r18055] Bug fix: 1192
Description:
Fixed exit code (sometimes return code in Main) to follow the HDF5 standards.
Tested:
H5committested plus serial test in Jam.
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/testh5dump.sh.in | 15 | ||||
| -rwxr-xr-x | tools/h5dump/testh5dumpxml.sh.in | 14 |
2 files changed, 18 insertions, 11 deletions
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index 9e6cb01..82d09fc 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -23,6 +23,10 @@ USE_FILTER_FLETCHER32="@USE_FILTER_FLETCHER32@" USE_FILTER_NBIT="@USE_FILTER_NBIT@" USE_FILTER_SCALEOFFSET="@USE_FILTER_SCALEOFFSET@" +TESTNAME=h5dump +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + DUMPER=h5dump # The tool name DUMPER_BIN=`pwd`/$DUMPER # The path of the tool binary TESTDIR=`pwd`/../testfiles @@ -509,11 +513,10 @@ TOOLTEST textlinksrc.ddl textlinksrc.h5 TOOLTEST textlinkfar.ddl textlinkfar.h5 - - if test $nerrors -eq 0 ; then - echo "All $DUMPER tests passed." + echo "All $TESTNAME tests passed." + exit $EXIT_SUCCESS +else + echo "$TESTNAME tests failed with $nerrors errors." + exit $EXIT_FAILURE fi - -exit $nerrors - diff --git a/tools/h5dump/testh5dumpxml.sh.in b/tools/h5dump/testh5dumpxml.sh.in index 3e81a05..c4c8657 100755 --- a/tools/h5dump/testh5dumpxml.sh.in +++ b/tools/h5dump/testh5dumpxml.sh.in @@ -15,6 +15,10 @@ # # Tests for the h5dump tool +TESTNAME=h5dumpxml +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + H5_LONE_COLON="@H5_LONE_COLON@" DUMPER=h5dump # The tool name @@ -185,10 +189,10 @@ TOOLTEST torderattr3.h5.xml --xml -H --sort_by=creation_order --sort_order=ascen TOOLTEST torderattr4.h5.xml --xml -H --sort_by=creation_order --sort_order=descending torderattr.h5 - - if test $nerrors -eq 0 ; then - echo "All $DUMPER tests passed." + echo "All $TESTNAME tests passed." + exit $EXIT_SUCCESS +else + echo "$TESTNAME tests failed with $nerrors errors." + exit $EXIT_FAILURE fi - -exit $nerrors |