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/h5copy | |
| 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/h5copy')
| -rw-r--r-- | tools/h5copy/h5copy.c | 4 | ||||
| -rw-r--r-- | tools/h5copy/testh5copy.sh | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c index f2a41ae..2d5b95d 100644 --- a/tools/h5copy/h5copy.c +++ b/tools/h5copy/h5copy.c @@ -428,7 +428,7 @@ main (int argc, const char *argv[]) h5tools_close(); - return 0; + return EXIT_SUCCESS; error: printf("Error in copy...Exiting\n"); @@ -449,6 +449,6 @@ error: h5tools_close(); - return 1; + return EXIT_FAILURE; } diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh index c374e08..4f1d8cc 100644 --- a/tools/h5copy/testh5copy.sh +++ b/tools/h5copy/testh5copy.sh @@ -19,6 +19,10 @@ # Thursday, July 20, 2006 # +TESTNAME=h5copy +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + H5COPY=h5copy # The tool name H5COPY_BIN=`pwd`/$H5COPY # The path of the tool binary H5DIFF=h5diff # The h5diff tool name @@ -300,8 +304,9 @@ COPYOBJECTS if test $nerrors -eq 0 ; then - echo "All h5copy tests passed." + echo "All $TESTNAME tests passed." + exit $EXIT_SUCCESS +else + echo "$TESTNAME tests failed with $nerrors errors." + exit $EXIT_FAILURE fi - -exit $nerrors - |