[svn-r18175] Description:

	Bring r17986:18172 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode

3 files changed, 17 insertions, 16 deletions

diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 15fcf90..620d0c0 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -322,12 +322,12 @@ CP = cp
 
 # Some machines need a command to run executables; this is that command
 # so that our tests will run.
-# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# We use RUNEXEC instead of RUNSERIAL directly because it may be that
 # some tests need to be run with a different command.  Older versions
 # of the makefiles used the command
 # $(LIBTOOL) --mode=execute
 # in some directories, for instance.
-RUNTESTS = $(RUNSERIAL)
+RUNEXEC = $(RUNSERIAL)
 
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
@@ -833,7 +833,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      fi; \
 	      echo "============================" >> $${log}; \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $(@:.chkexe_=.chkexe) || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -904,7 +904,7 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	@for test in $(TEST_PROG_PARA) dummy; do                             \
 	   if test $$test != dummy; then                                      \
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNTESTS="$(RUNPARALLEL)" || exit 1; \
+	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
 	   fi;                                                                \
 	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index 60ef494..e9e7dac 100755
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
 
       case 6:    /* -h found; help, then exit */
         help(argv[0]);
-        exit(0);
+        exit(EXIT_SUCCESS);
       break;
 
       case 7:    /* -d found; look for dimensions */
diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh
index ca445ed..d8b54a7 100755
--- a/tools/h5import/h5importtestutil.sh
+++ b/tools/h5import/h5importtestutil.sh
@@ -16,8 +16,12 @@
 # HDF Utilities Test script
 # Usage: h5importtestutil.sh [machine-type]
 
+TESTNAME=h5import
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
 # initialize errors variable
-errors=0
+nerrors=0
 
 TESTING() {
    SPACES="                                                               "
@@ -37,7 +41,7 @@ cd ..
 cmp -s tmp_testfiles/log1 log2 || err=1
 rm -f log2 tmp_testfiles/log1
 if [ $err -eq 1 ]; then
-errors="` expr $errors + 1 `";
+nerrors="` expr $nerrors + 1 `";
   echo "*FAILED*"
 else
   echo " PASSED"
@@ -120,18 +124,15 @@ rm -f  *.txt *.bin *.h5
 rm -rf tmp_testfiles
 else
 	echo "** h5import or h5importtest not available ***"
-	errors="` expr $errors + 1 `";
+	nerrors="` expr $nerrors + 1 `";
 fi
 
 #
 # Check errors result
-if [ $errors -eq 0 ]; then
-    echo "======================================"
-    echo " H5IMPORT Utilities tests have passed."
-    echo "======================================"    
+if test $nerrors -eq 0 ; then
+    echo "All $TESTNAME tests passed."
+    exit $EXIT_SUCCESS
 else
-    echo "*********************************************"
-    echo " H5IMPORT Utilities tests encountered errors"
-    echo "*********************************************"
+    echo "$TESTNAME tests failed with $nerrors errors."
+    exit $EXIT_FAILURE
 fi
-exit $errors