Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)

* commit 'c638d93f3e660ce669a36e50a02473aac126953d':
  Fixes missing chunk_info entry in CMake files
  Even more normalization with develop
  More normalizations with develop
  Misc normalizations with develop
  Normalization of perform directory with develop
  Brings monotonic timer changes from develop
  Brings Mirror VFD to 1.10 from develop
  Brings splitter VFD from develop
  Brings file locking changes from develop

33 files changed, 1116 insertions, 814 deletions

diff --git a/tools/src/h5diff/h5diff_main.c b/tools/src/h5diff/h5diff_main.c
index 33d6570..e14447d 100644
--- a/tools/src/h5diff/h5diff_main.c
+++ b/tools/src/h5diff/h5diff_main.c
@@ -26,7 +26,7 @@
  * Return: An  exit status of 0 means no differences were found, 1 means some
  *   differences were found.
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: May 9, 2003
  *
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index c473c8b..2336378 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -31,7 +31,7 @@ static void ph5diff_worker(int );
  * Return: An exit status of 0 means no differences were found, 1 means some
  *   differences were found.
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: May 9, 2003
  *
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index fda5fe9..bd02e3b 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -64,7 +64,7 @@ static struct long_options l_opts[] = {
         { NULL, 0, '\0' }
 };
 
-
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -185,7 +185,7 @@ error:
     return(-1); ;
 } /* parse_command_line() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: leave
  *
@@ -387,7 +387,7 @@ error:
     return -1;
 } /* end convert_dsets_cb() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: main
  *
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index b11fe7f..4a642e0 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -3735,8 +3735,8 @@ static int getExternalFilename(struct Input *in, FILE *strm)
         return (-1);
     }
 
-    in->externFilename = (char *) HDmalloc ((size_t) (HDstrlen(temp)) * sizeof(char));
-    (void) HDstrcpy(in->externFilename, temp);
+    in->externFilename = (char *) HDmalloc ((size_t) (HDstrlen(temp) + 1) * sizeof(char));
+    (void) HDstrncpy(in->externFilename, temp, HDstrlen(temp) + 1);
     return (0);
 }
 
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 8be1a11..c4c3122 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
+ * Programmer:  Robb Matzke
  *              Monday, March 23, 1998
  */
 
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index 9347eff..77f2272 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -522,6 +522,8 @@ done:
              */
             if (TRUE == h5tools_detect_vlen(wtype_id))
                 H5Dvlen_reclaim(wtype_id, space_id, H5P_DEFAULT, buf);
+
+            /* Free buf */
             HDfree(buf);
         }
 
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c
index 95cacc1..50ccd7a 100644
--- a/tools/src/h5repack/h5repack_parse.c
+++ b/tools/src/h5repack/h5repack_parse.c
@@ -478,7 +478,7 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
  * Example:
  * "AA,B,CDE:CHUNK=10X10"
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: December 30, 2003
  *
diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c
index 58a99a4..351c577 100644
--- a/tools/src/misc/h5debug.c
+++ b/tools/src/misc/h5debug.c
@@ -15,7 +15,7 @@
  *
  * Created:             debug.c
  *                      Jul 18 1997
- *                      Robb Matzke <matzke@llnl.gov>
+ *                      Robb Matzke
  *
  * Purpose:             Debugs an existing HDF5 file at a low level.
  *
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index 2b4d57f..2046373 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -46,7 +46,7 @@ typedef struct mkgrp_opt_t {
 
 mkgrp_opt_t params_g;           /* Command line parameter settings */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    leave
  *
@@ -78,7 +78,7 @@ leave(int ret)
     HDexit(ret);
 } /* end leave() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -104,7 +104,7 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "\n");
 } /* end usage() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    parse_command_line
  *
@@ -200,7 +200,7 @@ parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
     return 0;
 } /* parse_command_line() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: main
  *
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index d516fa0..371cf2c 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
+ * Programmer:  Robb Matzke
  *              Wednesday, May 13, 1998
  *
  * Purpose:    Repartitions a file family.  This program can be used to
diff --git a/tools/test/h5copy/testh5copy.sh.in b/tools/test/h5copy/testh5copy.sh.in
index 2440ca4..ebbcb6c 100644
--- a/tools/test/h5copy/testh5copy.sh.in
+++ b/tools/test/h5copy/testh5copy.sh.in
@@ -13,7 +13,7 @@
 #
 # Tests for the h5copy tool
 #
-# Pedro Vicente Nunes (pvn@hdfgroup.org), Albert Cheng (acheng@hdfgroup.org)
+# Pedro Vicente Nunes, Albert Cheng
 # Thursday, July 20, 2006
 #
 
@@ -200,6 +200,7 @@ TOOLTEST()
         fi
         runh5diff=no
     fi
+
     if [ "$3" = -o ]; then
         outputfile=$4
     else
@@ -219,6 +220,7 @@ TOOLTEST()
         $RUNSERIAL $H5COPY_BIN $@
     ) > $actualout 2> $actualerr
     RET=$?
+
     if [ $RET != 0 ]; then
         echo "*FAILED*"
         echo "failed result is:"
@@ -268,6 +270,7 @@ TOOLTEST_PREFILL()
         $RUNSERIAL $H5COPY_BIN  -i $inputfile -o $outputfile -v -s $grp_name -d $grp_name2
     ) > $actualout 2> $actualerr
     RET=$?
+
     if [ $RET != 0 ]; then
         echo "*FAILED*"
         echo "failed result is:"
@@ -282,6 +285,7 @@ TOOLTEST_PREFILL()
             $RUNSERIAL $H5COPY_BIN  -i $inputfile -o $outputfile -v -s $obj_name -d $obj_name2
         ) > $actualout 2> $actualerr
         RET=$?
+
         if [ $RET != 0 ]; then
             echo "*FAILED*"
             echo "failed result is:"
@@ -313,6 +317,7 @@ TOOLTEST_SAME()
     else
         runh5diff=no
     fi
+
     if [ "$3" = -o ]; then
         outputfile=$4
     else
@@ -330,6 +335,7 @@ TOOLTEST_SAME()
         $RUNSERIAL $H5COPY_BIN  -i $inputfile -o $outputfile -v -s $grp_name -d $grp_name
     ) > $actualout 2> $actualerr
     RET=$?
+
     if [ $RET != 0 ]; then
         echo "*FAILED*"
         echo "failed result is:"
@@ -344,6 +350,7 @@ TOOLTEST_SAME()
             $RUNSERIAL $H5COPY_BIN  -i $outputfile -o $outputfile -v -s $grp_name -d $grp_name2
         ) > $actualout 2> $actualerr
         RET=$?
+
         if [ $RET != 0 ]; then
             echo "*FAILED*"
             echo "failed result is:"
@@ -406,6 +413,7 @@ TOOLTEST_FAIL()
     if [ "$1" = -i ]; then
         inputfile=$2
     fi
+
     if [ "$3" = -o ]; then
         outputfile=$4
     fi
@@ -417,8 +425,8 @@ TOOLTEST_FAIL()
         #echo "#############################"
         $RUNSERIAL $H5COPY_BIN $@
     ) > $actualout 2> $actualerr
-
     RET=$?
+
     # save actualout and actualerr in case they are needed later.
     cp $actualout $actualout_sav
     STDOUT_FILTER $actualout
diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in
index 341cba5..ffc43da 100644
--- a/tools/test/h5diff/h5diff_plugin.sh.in
+++ b/tools/test/h5diff/h5diff_plugin.sh.in
@@ -135,24 +135,24 @@ CLEAN_TESTFILES_AND_TESTDIR()
 #   -h   print help page
 while [ $# -gt 0 ]; do
     case "$1" in
-    -p)    # reset the tool name and bin to run ph5diff tests
-    TESTNAME=ph5diff
-    H5DIFF=../../src/h5diff/ph5diff  # The tool name
-    H5DIFF_BIN=`pwd`/$H5DIFF    # The path of the tool binary
-    pmode=yes
-    shift
-    ;;
+    -p) # reset the tool name and bin to run ph5diff tests
+        TESTNAME=ph5diff
+        H5DIFF=../../src/h5diff/ph5diff  # The tool name
+        H5DIFF_BIN=`pwd`/$H5DIFF    # The path of the tool binary
+        pmode=yes
+        shift
+        ;;
     -h) # print help page
-    echo "$0 [-p] [-h]"
-    echo "    -p   run ph5diff tests"
-    echo "    -h   print help page"
-    shift
-    exit 0
-    ;;
+        echo "$0 [-p] [-h]"
+        echo "    -p   run ph5diff tests"
+        echo "    -h   print help page"
+        shift
+        exit 0
+        ;;
     *)  # unknown option
         echo "$0: Unknown option ($1)"
-    exit 1
-    ;;
+        exit 1
+        ;;
     esac
 done
 
@@ -218,19 +218,21 @@ TOOLTEST() {
     # Run test.
     TESTING $H5DIFF $@
     (
-    #echo "#############################"
-    #echo "Expected output for '$H5DIFF $@'"
-    #echo "#############################"
-    cd $TESTDIR
-    eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
+        #echo "#############################"
+        #echo "Expected output for '$H5DIFF $@'"
+        #echo "#############################"
+        cd $TESTDIR
+        eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
     ) >$actual 2>$actual_err
     EXIT_CODE=$?
+
     # save actual and actual_err in case they are needed later.
     cp $actual $actual_sav
     STDOUT_FILTER $actual
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
     cat $actual_err >> $actual
+
     # don't add exit code check in pmode, as it causes failure. (exit code
     # is from mpirun not tool)
     # if any problem occurs relate to an exit code, it will be caught in
@@ -260,27 +262,29 @@ TOOLTEST() {
         actual_sorted=actual_sorted
         sort $expect -o $expect_sorted
         sort $actual -o $actual_sorted
+
         # remove "EXIT CODE:" line from expect file. test for exit code
         # is done by serial mode.
         grep -v "EXIT CODE:" $expect_sorted > $expect_sorted.noexit
         mv $expect_sorted.noexit $expect_sorted
-    if $CMP $expect_sorted $actual_sorted; then
-        echo " PASSED"
-    else
-        echo "*FAILED*"
-        nerrors="`expr $nerrors + 1`"
-        if test yes = "$verbose"; then
-        echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
-        $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
-        echo "====The actual output ($actual_sav)"
-        sed 's/^/    /' < $actual_sav
-        echo "====The actual stderr ($actual_err_sav)"
-        sed 's/^/    /' < $actual_err_sav
-        echo "====End of actual stderr ($actual_err_sav)"
-        echo ""
+
+        if $CMP $expect_sorted $actual_sorted; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            nerrors="`expr $nerrors + 1`"
+            if test yes = "$verbose"; then
+                echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
+                $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
+                echo "====The actual output ($actual_sav)"
+                sed 's/^/    /' < $actual_sav
+                echo "====The actual stderr ($actual_err_sav)"
+                sed 's/^/    /' < $actual_err_sav
+                echo "====End of actual stderr ($actual_err_sav)"
+                echo ""
+            fi
         fi
     fi
-    fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
@@ -306,18 +310,20 @@ TOOLTEST_ERR() {
     # Run test.
     TESTING $H5DIFF $@
     (
-    #echo "#############################"
-    #echo "Expected output for '$H5DIFF $@'"
-    #echo "#############################"
-    cd $TESTDIR
-    eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
+        #echo "#############################"
+        #echo "Expected output for '$H5DIFF $@'"
+        #echo "#############################"
+        cd $TESTDIR
+        eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
     ) >$actual 2>$actual_err
     EXIT_CODE=$?
+
     # save actual and actual_err in case they are needed later.
     cp $actual $actual_sav
     STDOUT_FILTER $actual
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
+
     # don't add exit code check in pmode, as it causes failure. (exit code
     # is from mpirun not tool)
     # if any problem occurs relate to an exit code, it will be caught in
@@ -348,23 +354,24 @@ TOOLTEST_ERR() {
         sort $expect_err -o $expect_sorted
         sort $actual_err -o $actual_sorted
         mv $expect_sorted.noexit $expect_sorted
-    if $CMP $expect_sorted $actual_sorted; then
-        echo " PASSED"
-    else
-        echo "*FAILED*"
-        nerrors="`expr $nerrors + 1`"
-        if test yes = "$verbose"; then
-        echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
-        $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
-        echo "====The actual output ($actual_sav)"
-        sed 's/^/    /' < $actual_sav
-        echo "====The actual stderr ($actual_err_sav)"
-        sed 's/^/    /' < $actual_err_sav
-        echo "====End of actual stderr ($actual_err_sav)"
-        echo ""
+
+        if $CMP $expect_sorted $actual_sorted; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            nerrors="`expr $nerrors + 1`"
+            if test yes = "$verbose"; then
+                echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
+                $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
+                echo "====The actual output ($actual_sav)"
+                sed 's/^/    /' < $actual_sav
+                echo "====The actual stderr ($actual_err_sav)"
+                sed 's/^/    /' < $actual_err_sav
+                echo "====End of actual stderr ($actual_err_sav)"
+                echo ""
+            fi
         fi
     fi
-    fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index 962f09c..efc2722 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -486,18 +486,20 @@ TOOLTEST() {
     # Run test.
     TESTING $H5DIFF $@
     (
-    #echo "#############################"
-    #echo "Expected output for '$H5DIFF $@'"
-    #echo "#############################"
-    cd $TESTDIR
-    eval $RUNCMD $H5DIFF_BIN "$@"
+        #echo "#############################"
+        #echo "Expected output for '$H5DIFF $@'"
+        #echo "#############################"
+        cd $TESTDIR
+        eval $RUNCMD $H5DIFF_BIN "$@"
     ) >$actual 2>$actual_err
     EXIT_CODE=$?
+
     # save actual and actual_err in case they are needed later.
     cp $actual $actual_sav
     STDOUT_FILTER $actual
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
+
     # don't add exit code check in pmode, as it causes failure. (exit code
     # is from mpirun not tool)
     # if any problem occurs relate to an exit code, it will be caught in
@@ -531,23 +533,24 @@ TOOLTEST() {
         # is done by serial mode.
         grep -v "EXIT CODE:" $expect_sorted > $expect_sorted.noexit
         mv $expect_sorted.noexit $expect_sorted
-    if $CMP $expect_sorted $actual_sorted; then
-        echo " PASSED"
-    else
-        echo "*FAILED*"
-        nerrors="`expr $nerrors + 1`"
-        if test yes = "$verbose"; then
-        echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
-        $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
-        echo "====The actual output ($actual_sav)"
-        sed 's/^/    /' < $actual_sav
-        echo "====The actual stderr ($actual_err_sav)"
-        sed 's/^/    /' < $actual_err_sav
-        echo "====End of actual stderr ($actual_err_sav)"
-        echo ""
+
+        if $CMP $expect_sorted $actual_sorted; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            nerrors="`expr $nerrors + 1`"
+            if test yes = "$verbose"; then
+            echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
+            $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
+            echo "====The actual output ($actual_sav)"
+            sed 's/^/    /' < $actual_sav
+            echo "====The actual stderr ($actual_err_sav)"
+            sed 's/^/    /' < $actual_err_sav
+            echo "====End of actual stderr ($actual_err_sav)"
+            echo ""
+            fi
         fi
     fi
-    fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in
index 6a00a16..d940ab3 100644
--- a/tools/test/h5dump/h5dump_plugin.sh.in
+++ b/tools/test/h5dump/h5dump_plugin.sh.in
@@ -181,8 +181,8 @@ TOOLTEST() {
     # Run test.
     TESTING $H5DUMP $@
     (
-    cd $TESTDIR
-      $ENVCMD $RUNSERIAL $H5DUMP_BIN "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $H5DUMP_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -192,24 +192,24 @@ TOOLTEST() {
     STDERR_FILTER $actual_err
     cat $actual_err >> $actual
 
-  if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual > /dev/null 2>&1 ; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+        rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
 
 }
diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in
index 02d5da0..1704e1e 100644
--- a/tools/test/h5dump/testh5dump.sh.in
+++ b/tools/test/h5dump/testh5dump.sh.in
@@ -458,14 +458,14 @@ TESTING() {
 TOOLTEST() {
     # check if caseless compare and diff requested
     if [ "$1" = ignorecase ]; then
-    caseless="-i"
-    # replace cmp with diff which runs much longer.
-    xCMP="$DIFF -i"
-    shift
+        caseless="-i"
+        # replace cmp with diff which runs much longer.
+        xCMP="$DIFF -i"
+        shift
     else
-    caseless=""
-    # stick with faster cmp if ignorecase is not requested.
-    xCMP="$CMP"
+        caseless=""
+        # stick with faster cmp if ignorecase is not requested.
+        xCMP="$CMP"
     fi
 
     expect="$TESTDIR/$1"
@@ -478,8 +478,8 @@ TOOLTEST() {
     # Run test.
     TESTING $DUMPER $@
     (
-    cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -488,24 +488,24 @@ TOOLTEST() {
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
 
-  if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $xCMP $expect $actual > /dev/null 2>&1 ; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+        rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
 
 }
@@ -527,41 +527,41 @@ TOOLTEST2() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
-    elif $CMP $expect $actual; then
-      if [ ! -f $expectdata ]; then
-      # Create the expect data file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
-        cp $actualdata $expectdata
-        echo "    Expected data (*.exp) missing"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
         nerrors="`expr $nerrors + 1`"
-      elif $CMP $expectdata $actualdata; then
-        echo " PASSED"
-      else
+    elif $CMP $expect $actual; then
+        if [ ! -f $expectdata ]; then
+            # Create the expect data file if it doesn't yet exist.
+            echo " CREATED"
+            cp $actualdata $expectdata
+            echo "    Expected data (*.exp) missing"
+            nerrors="`expr $nerrors + 1`"
+        elif $CMP $expectdata $actualdata; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
+        fi
+    else
         echo "*FAILED*"
-        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
         nerrors="`expr $nerrors + 1`"
-        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
-      fi
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actualdata $actual_err
+        rm -f $actual $actualdata $actual_err
     fi
 
 }
@@ -585,56 +585,55 @@ TOOLTEST2A() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
-    elif $CMP $expect $actual; then
-      if [ ! -f $expectdata ]; then
-      # Create the expect data file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
-        cp $actualdata $expectdata
-        echo "    Expected data (*.exp) missing"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
         nerrors="`expr $nerrors + 1`"
-      elif $DIFF $expectdata $actualdata; then
-        if [ ! -f $expectmeta ]; then
-        # Create the expect meta file if it doesn't yet exist.
-          echo " CREATED"
-          cp $actualmeta $expectmeta
-          echo "    Expected metafile (*.ddl) missing"
-          nerrors="`expr $nerrors + 1`"
-        elif $CMP $expectmeta $actualmeta; then
-          echo " PASSED"
+    elif $CMP $expect $actual; then
+        if [ ! -f $expectdata ]; then
+            # Create the expect data file if it doesn't yet exist.
+            echo " CREATED"
+            cp $actualdata $expectdata
+            echo "    Expected data (*.exp) missing"
+            nerrors="`expr $nerrors + 1`"
+        elif $DIFF $expectdata $actualdata; then
+            if [ ! -f $expectmeta ]; then
+                # Create the expect meta file if it doesn't yet exist.
+                echo " CREATED"
+                cp $actualmeta $expectmeta
+                echo "    Expected metafile (*.ddl) missing"
+                nerrors="`expr $nerrors + 1`"
+            elif $CMP $expectmeta $actualmeta; then
+                echo " PASSED"
+            else
+                echo "*FAILED*"
+                echo "    Expected metafile (*.ddl) differs from actual metafile (*.txt)"
+                nerrors="`expr $nerrors + 1`"
+                test yes = "$verbose" && $DIFF $expectmeta $actualmeta |sed 's/^/    /'
+            fi
         else
-          echo "*FAILED*"
-          echo "    Expected metafile (*.ddl) differs from actual metafile (*.txt)"
-          nerrors="`expr $nerrors + 1`"
-          test yes = "$verbose" && $DIFF $expectmeta $actualmeta |sed 's/^/    /'
+            echo "*FAILED*"
+            echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
         fi
-      else
+    else
         echo "*FAILED*"
-        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
         nerrors="`expr $nerrors + 1`"
-        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
-      fi
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actualdata $actual_err $actualmeta
+        rm -f $actual $actualdata $actual_err $actualmeta
     fi
-
 }
 
 # same as TOOLTEST2 but only compares the generated data file to the expected data file
@@ -651,28 +650,28 @@ TOOLTEST2B() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expectdata ]; then
-    # Create the expect data file if it doesn't yet exist.
-      echo " CREATED"
-      cp $actualdata $expectdata
-      echo "    Expected data (*.exp) missing"
-      nerrors="`expr $nerrors + 1`"
+        # Create the expect data file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actualdata $expectdata
+        echo "    Expected data (*.exp) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expectdata $actualdata; then
-      echo " PASSED"
+        echo " PASSED"
     else
-      echo "*FAILED*"
-      echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actualdata $actual_err
+        rm -f $actual $actualdata $actual_err
     fi
 
 }
@@ -692,8 +691,8 @@ TOOLTEST3() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -712,23 +711,23 @@ TOOLTEST3() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -750,8 +749,8 @@ TOOLTEST4() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -770,30 +769,30 @@ TOOLTEST4() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     if $CMP $expect_err $actual_ext; then
-      echo " PASSED"
-     else
-      echo "*FAILED*"
-      echo "    Expected result (*.err) differs from actual result (*.oerr)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-     fi
+        if $CMP $expect_err $actual_ext; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected result (*.err) differs from actual result (*.oerr)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+        fi
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -815,8 +814,8 @@ TOOLTEST5() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -835,33 +834,33 @@ TOOLTEST5() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     if $CMP $expect_err $actual_ext; then
-      echo " PASSED"
-     else
-      echo "*FAILED*"
-      echo "    Expected result (*.err) differs from actual result (*.oerr)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-     fi
+        if $CMP $expect_err $actual_ext; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected result (*.err) differs from actual result (*.oerr)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+        fi
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
-
 }
+
 # ADD_HELP_TEST
 TOOLTEST_HELP() {
 
@@ -873,27 +872,27 @@ TOOLTEST_HELP() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expectdata ]; then
-    # Create the expect data file if it doesn't yet exist.
-      echo " CREATED"
-      cp $actual $expect-CREATED
-      echo "    Expected output (*.txt) missing"
-      nerrors="`expr $nerrors + 1`"
+        # Create the expect data file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect-CREATED
+        echo "    Expected output (*.txt) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-      echo " PASSED"
+        echo " PASSED"
     else
-      echo "*FAILED*"
-      echo "    Expected output (*.txt) differs from actual output (*.out)"
-      nerrors="`expr $nerrors + 1`"
+        echo "*FAILED*"
+        echo "    Expected output (*.txt) differs from actual output (*.out)"
+        nerrors="`expr $nerrors + 1`"
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err
+        rm -f $actual $actual_err
     fi
 
 }
@@ -913,14 +912,16 @@ GREPTEST()
     # Run test.
     TESTING $DUMPER -p $@
     (
-      cd $TESTDIR
-      $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
     ) >$actual 2>$actual_err
+
     if [ "$txttype" = "ERRTXT" ]; then
         $GREP "$expectdata" $actual_err > /dev/null
     else
         $GREP "$expectdata" $actual > /dev/null
     fi
+
     if [ $? -eq 0 ]; then
         echo " PASSED"
     else
@@ -930,7 +931,7 @@ GREPTEST()
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err
+        rm -f $actual $actual_err
     fi
 }
 
@@ -949,14 +950,16 @@ GREPTEST2()
     # Run test.
     TESTING $DUMPER -p $@
     (
-      cd $TESTDIR
-      $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
     ) >$actual 2>$actual_err
+
     if [ "$txttype" = "ERRTXT" ]; then
         $GREP "$expectdata" $actual_err > /dev/null
     else
         $GREP "$expectdata" $actual > /dev/null
     fi
+
     if [ $? -eq 0 ]; then
         echo " PASSED"
     else
@@ -966,21 +969,21 @@ GREPTEST2()
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err
+        rm -f $actual $actual_err
     fi
 }
 
 # Print a "SKIP" message
 SKIP() {
-   TESTING $DUMPER $@
+    TESTING $DUMPER $@
     echo  " -SKIP-"
 }
 
 # Print a line-line message left justified in a field of 70 characters
 #
 PRINT_H5DIFF() {
- SPACES="                                                               "
- echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 
@@ -990,10 +993,11 @@ DIFFTEST()
 {
     PRINT_H5DIFF  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5DIFF_BIN "$@" -q
+        cd $TESTDIR
+        $RUNSERIAL $H5DIFF_BIN "$@" -q
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
@@ -1007,8 +1011,8 @@ DIFFTEST()
 # beginning with the word "Verifying".
 #
 PRINT_H5IMPORT() {
- SPACES="                                                               "
- echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 # Call the h5import tool
@@ -1018,15 +1022,16 @@ IMPORTTEST()
     # remove the output hdf5 file if it exists
     hdf5_file="$TESTDIR/$5"
     if [ -f $hdf5_file ]; then
-     rm -f $hdf5_file
+        rm -f $hdf5_file
     fi
 
     PRINT_H5IMPORT  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5IMPORT_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $H5IMPORT_BIN "$@"
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
@@ -1131,9 +1136,9 @@ TOOLTEST tcomp-4.ddl --enable-error-stack tcompound_complex.h5
 TOOLTEST tcompound_complex2.ddl --enable-error-stack tcompound_complex2.h5
 # tests for bitfields and opaque data types
 if test $WORDS_BIGENDIAN != "yes"; then
-TOOLTEST tbitnopaque_le.ddl --enable-error-stack tbitnopaque.h5
+    TOOLTEST tbitnopaque_le.ddl --enable-error-stack tbitnopaque.h5
 else
-TOOLTEST tbitnopaque_be.ddl --enable-error-stack tbitnopaque.h5
+    TOOLTEST tbitnopaque_be.ddl --enable-error-stack tbitnopaque.h5
 fi
 
 #test for the nested compound type
@@ -1311,12 +1316,12 @@ TOOLTEST tallfilters.ddl --enable-error-stack -H -p -d all  tfilters.h5
 TOOLTEST tuserfilter.ddl --enable-error-stack -H  -p -d myfilter  tfilters.h5
 
 if test $USE_FILTER_DEFLATE = "yes" ; then
-  # data read internal filters
-  TOOLTEST treadintfilter.ddl --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5
-  if test $USE_FILTER_SZIP = "yes"; then
-    # data read
-    TOOLTEST treadfilter.ddl --enable-error-stack -d all -d szip tfilters.h5
-  fi
+    # data read internal filters
+    TOOLTEST treadintfilter.ddl --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5
+    if test $USE_FILTER_SZIP = "yes"; then
+        # data read
+        TOOLTEST treadfilter.ddl --enable-error-stack -d all -d szip tfilters.h5
+    fi
 fi
 
 # test for displaying objects with very long names
@@ -1373,9 +1378,9 @@ TOOLTEST   tbin4.ddl --enable-error-stack -d double  -b FILE -o out4.bin    tbin
 
 # Clean up binary output files
 if test -z "$HDF5_NOCLEANUP"; then
- rm -f out[1-4].bin
- rm -f out1.h5
- rm -f out3.h5
+    rm -f out[1-4].bin
+    rm -f out1.h5
+    rm -f out3.h5
 fi
 
 # test for dataset region references
@@ -1387,7 +1392,7 @@ TOOLTEST2 tbinregR.exp --enable-error-stack -d /Dataset1 -s 0 -R -y -o tbinregR.
 
 # Clean up text output files
 if test -z "$HDF5_NOCLEANUP"; then
- rm -f tbinregR.txt
+    rm -f tbinregR.txt
 fi
 
 # tests for group creation order
diff --git a/tools/test/h5dump/testh5dumppbits.sh.in b/tools/test/h5dump/testh5dumppbits.sh.in
index febce2c..ff0659a 100644
--- a/tools/test/h5dump/testh5dumppbits.sh.in
+++ b/tools/test/h5dump/testh5dumppbits.sh.in
@@ -236,26 +236,25 @@ TOOLTEST() {
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
 
-  if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-   nerrors="`expr $nerrors + 1`"
-   test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+        rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
-
 }
 
 
@@ -274,36 +273,36 @@ TOOLTEST2() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
-    elif $CMP $expect $actual; then
-      if [ ! -f $expectdata ]; then
-      # Create the expect data file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
-        cp $actualdata $expectdata
-        echo "    Expected data (*.exp) missing"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
         nerrors="`expr $nerrors + 1`"
-      elif $CMP $expectdata $actualdata; then
-        echo " PASSED"
-      else
+    elif $CMP $expect $actual; then
+        if [ ! -f $expectdata ]; then
+            # Create the expect data file if it doesn't yet exist.
+            echo " CREATED"
+            cp $actualdata $expectdata
+            echo "    Expected data (*.exp) missing"
+            nerrors="`expr $nerrors + 1`"
+        elif $CMP $expectdata $actualdata; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
+        fi
+    else
         echo "*FAILED*"
-        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
         nerrors="`expr $nerrors + 1`"
-        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
-      fi
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
@@ -328,8 +327,8 @@ TOOLTEST3() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -348,23 +347,23 @@ TOOLTEST3() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -385,8 +384,8 @@ TOOLTEST4() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -405,30 +404,30 @@ TOOLTEST4() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     if $CMP $expect_err $actual_ext; then
-      echo " PASSED"
-     else
-      echo "*FAILED*"
-      echo "    Expected result (*.err) differs from actual result (*.oerr)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-     fi
+        if $CMP $expect_err $actual_ext; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected result (*.err) differs from actual result (*.oerr)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+        fi
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -442,8 +441,8 @@ SKIP() {
 # Print a line-line message left justified in a field of 70 characters
 #
 PRINT_H5DIFF() {
- SPACES="                                                               "
- echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 
@@ -453,10 +452,11 @@ DIFFTEST()
 {
     PRINT_H5DIFF  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5DIFF_BIN "$@" -q
+        cd $TESTDIR
+        $RUNSERIAL $H5DIFF_BIN "$@" -q
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
@@ -470,8 +470,8 @@ DIFFTEST()
 # beginning with the word "Verifying".
 #
 PRINT_H5IMPORT() {
- SPACES="                                                               "
- echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 # Call the h5import tool
@@ -481,22 +481,22 @@ IMPORTTEST()
     # remove the output hdf5 file if it exists
     hdf5_file="$TESTDIR/$5"
     if [ -f $hdf5_file ]; then
-     rm -f $hdf5_file
+        rm -f $hdf5_file
     fi
 
     PRINT_H5IMPORT  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5IMPORT_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $H5IMPORT_BIN "$@"
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
     else
          echo " PASSED"
     fi
-
 }
 
 
diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in
index f89234e..29ff238 100644
--- a/tools/test/h5dump/testh5dumpvds.sh.in
+++ b/tools/test/h5dump/testh5dumpvds.sh.in
@@ -205,8 +205,8 @@ TOOLTEST() {
     # Run test.
     TESTING $DUMPER $@
     (
-    cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -216,26 +216,25 @@ TOOLTEST() {
     STDERR_FILTER $actual_err
     cat $actual_err >> $actual
 
-  if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-   nerrors="`expr $nerrors + 1`"
-   test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+        rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
-
 }
 
 
@@ -254,42 +253,42 @@ TOOLTEST2() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
     cat $actual_err >> $actual
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
-    elif $CMP $expect $actual; then
-      if [ ! -f $expectdata ]; then
-      # Create the expect data file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
-        cp $actualdata $expectdata
-        echo "    Expected data (*.exp) missing"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
         nerrors="`expr $nerrors + 1`"
-      elif $CMP $expectdata $actualdata; then
-        echo " PASSED"
-      else
+    elif $CMP $expect $actual; then
+        if [ ! -f $expectdata ]; then
+            # Create the expect data file if it doesn't yet exist.
+            echo " CREATED"
+            cp $actualdata $expectdata
+            echo "    Expected data (*.exp) missing"
+            nerrors="`expr $nerrors + 1`"
+        elif $CMP $expectdata $actualdata; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
+        fi
+    else
         echo "*FAILED*"
-        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
         nerrors="`expr $nerrors + 1`"
-        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
-      fi
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actualdata $actual_err
+        rm -f $actual $actualdata $actual_err
     fi
 
 }
@@ -309,8 +308,8 @@ TOOLTEST3() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -326,27 +325,27 @@ TOOLTEST3() {
         -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
         -e 's/H5Eget_auto[1-2]*/H5Eget_auto(1 or 2)/' \
         -e 's/H5Eset_auto[1-2]*/H5Eset_auto(1 or 2)/' \
-     $actual_err > $actual_ext
+        $actual_err > $actual_ext
     cat $actual_ext >> $actual
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -367,8 +366,8 @@ TOOLTEST4() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -384,47 +383,46 @@ TOOLTEST4() {
         -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
         -e 's/H5Eget_auto[1-2]*/H5Eget_auto(1 or 2)/' \
         -e 's/H5Eset_auto[1-2]*/H5Eset_auto(1 or 2)/' \
-     $actual_err > $actual_ext
+        $actual_err > $actual_ext
     #cat $actual_ext >> $actual
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
     elif $CMP $expect $actual; then
-     if $CMP $expect_err $actual_ext; then
-      echo " PASSED"
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.err) differs from actual result (*.oerr)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-    fi
+        if $CMP $expect_err $actual_ext; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected result (*.err) differs from actual result (*.oerr)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+        fi
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
-
 }
 
 # Print a "SKIP" message
 SKIP() {
-   TESTING $DUMPER $@
+    TESTING $DUMPER $@
     echo  " -SKIP-"
 }
 
 # Print a line-line message left justified in a field of 70 characters
 #
 PRINT_H5DIFF() {
- SPACES="                                                               "
- echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 
@@ -434,25 +432,25 @@ DIFFTEST()
 {
     PRINT_H5DIFF  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5DIFF_BIN "$@" -q
+        cd $TESTDIR
+        $RUNSERIAL $H5DIFF_BIN "$@" -q
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
     else
          echo " PASSED"
     fi
-
 }
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Verifying".
 #
 PRINT_H5IMPORT() {
- SPACES="                                                               "
- echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 # Call the h5import tool
@@ -462,22 +460,22 @@ IMPORTTEST()
     # remove the output hdf5 file if it exists
     hdf5_file="$TESTDIR/$5"
     if [ -f $hdf5_file ]; then
-     rm -f $hdf5_file
+        rm -f $hdf5_file
     fi
 
     PRINT_H5IMPORT  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5IMPORT_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $H5IMPORT_BIN "$@"
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
     else
          echo " PASSED"
     fi
-
 }
 
 
@@ -491,7 +489,7 @@ COPY_TESTFILES_TO_TESTDIR
 
 ####### test for dataset vds ######
 
-  # Data read
+# Data read
 if test $USE_FILTER_DEFLATE = "yes" ; then
     TOOLTEST tvds-1.ddl --enable-error-stack 1_vds.h5
     TOOLTEST tvds-2.ddl --enable-error-stack 2_vds.h5
@@ -504,7 +502,7 @@ if test $USE_FILTER_DEFLATE = "yes" ; then
     TOOLTEST vds-gap2.ddl --vds-gap-size=2 --enable-error-stack vds-eiger.h5
 fi
 
-  # Layout read
+# Layout read
 if test $USE_FILTER_DEFLATE = "yes" ; then
     TOOLTEST tvds_layout-1.ddl -p --enable-error-stack 1_vds.h5
     TOOLTEST tvds_layout-2.ddl -p --enable-error-stack 2_vds.h5
diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in
index f7af300..52a13c2 100644
--- a/tools/test/h5dump/testh5dumpxml.sh.in
+++ b/tools/test/h5dump/testh5dumpxml.sh.in
@@ -262,36 +262,35 @@ TOOLTEST() {
     # Run test.
     TESTING $DUMPER $@
     (
-    cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
-
    if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-    echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.xml) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.xml) missing"
+        nerrors="`expr $nerrors + 1`"
    elif  $CMP $expect $actual; then
-      echo " PASSED"
+        echo " PASSED"
    else
-      echo "*FAILED*"
-      echo "    Expected result (*.xml) differs from actual result (*.out)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.xml) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
    fi
 
    # Clean up output file
    if test -z "$HDF5_NOCLEANUP"; then
-      rm -f $actual $actual_err
+        rm -f $actual $actual_err
    fi
 }
 
 # Print a "SKIP" message
 SKIP() {
-         TESTING $DUMPER $@
-          echo  " -SKIP-"
+    TESTING $DUMPER $@
+    echo  " -SKIP-"
 }
 
 
diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in
index c89269d..28370e6 100644
--- a/tools/test/h5ls/h5ls_plugin.sh.in
+++ b/tools/test/h5ls/h5ls_plugin.sh.in
@@ -139,8 +139,8 @@ CLEAN_TESTFILES_AND_TESTDIR()
 # Print a $* message left justified in a field of 70 characters
 #
 MESSAGE() {
-   SPACES="                                                               "
-   echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 # Print a line-line message left justified in a field of 70 characters
@@ -206,7 +206,7 @@ TOOLTEST() {
             echo ""
         fi
     elif [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
         echo "    Expected result (*.ls) missing"
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index 911572e..5cd76ef 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -3872,7 +3872,7 @@ out:
 *
 * Purpose: write datasets in LOC_ID
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
@@ -4736,7 +4736,7 @@ out:
 *
 * Purpose: write attributes in LOC_ID (dataset, group, named datatype)
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
@@ -5927,7 +5927,7 @@ out:
 *
 * Purpose: utility function to create and write a dataset in LOC_ID
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
@@ -5963,7 +5963,7 @@ out:
 *
 * Purpose: utility function to create and write a dataset in LOC_ID
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
@@ -6011,7 +6011,7 @@ out:
 *
 * Purpose: utility function to write an attribute in LOC_ID
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
diff --git a/tools/test/misc/h5perf_gentest.c b/tools/test/misc/h5perf_gentest.c
index f50e5fb..511a9e2 100644
--- a/tools/test/misc/h5perf_gentest.c
+++ b/tools/test/misc/h5perf_gentest.c
@@ -14,7 +14,7 @@
   creates a large number of attributes, groups, and datasets by specifying
   -a, -g, -d options respectively. Using "-h" option to see details.
 
-  Programmer:  Peter Cao <xcao@hdfgroup.org>, Jan. 2013
+  Programmer:  Peter Cao, Jan. 2013
  ****************************************************************************/
 
 #include "hdf5.h"
@@ -128,7 +128,7 @@ int main (int argc, char *argv[])
 
   Return:  Non-negative on success/Negative on failure
 
-  Programmer:  Peter Cao <xcao@hdfgroup.org>, Jan. 2013
+  Programmer:  Peter Cao, Jan. 2013
  ****************************************************************************/
 herr_t create_perf_test_file(const char *fname, int ngrps, int ndsets,
        int nattrs, hsize_t nrows, hsize_t dim0, hsize_t chunk, int vlen,
diff --git a/tools/test/misc/h5repart_gentest.c b/tools/test/misc/h5repart_gentest.c
index bd94104..520069f 100644
--- a/tools/test/misc/h5repart_gentest.c
+++ b/tools/test/misc/h5repart_gentest.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Raymond Lu<slu@ncsa.uiuc.edu>
+ * Programmer:  Raymond Lu
  *              June 1, 2005
  *
  * Purpose:     Generate a family file of 1024 bytes for each member
diff --git a/tools/test/misc/testh5mkgrp.sh.in b/tools/test/misc/testh5mkgrp.sh.in
index 3ad1f71..7dc8155 100644
--- a/tools/test/misc/testh5mkgrp.sh.in
+++ b/tools/test/misc/testh5mkgrp.sh.in
@@ -13,7 +13,7 @@
 #
 # Tests for the h5mkgrp tool
 #
-# Quincey Koziol (koziol@hdfgroup.org)
+# Quincey Koziol
 # Tuesday, February 13, 2007
 #
 
@@ -150,10 +150,11 @@ TOOLTEST()
 {
     TESTING $H5MKGRP $@
     (
-    cd $TESTDIR
-    $RUNSERIAL $H5MKGRP_BIN $@
+        cd $TESTDIR
+        $RUNSERIAL $H5MKGRP_BIN $@
     ) > output.out
     RET=$?
+
     if [ $RET != 0 ]; then
         echo "*FAILED*"
         echo "failed result is:"
@@ -164,7 +165,7 @@ TOOLTEST()
 
         # Clean up output file
         if test -z "$HDF5_NOCLEANUP"; then
-           rm -f output.out
+            rm -f output.out
         fi
     fi
 }
@@ -181,8 +182,8 @@ H5LSTEST()
     # any unexpected output from that stream too.
     VERIFY_H5LS  $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $H5LS_BIN $H5LS_ARGS $@
+        cd $TESTDIR
+        $RUNSERIAL $H5LS_BIN $H5LS_ARGS $@
     ) 2>&1 |sed 's/Modified:.*/Modified:  XXXX-XX-XX XX:XX:XX XXX/' >$actual
 
     # save actual in case it is needed later.
@@ -190,25 +191,25 @@ H5LSTEST()
     STDOUT_FILTER $actual
     STDERR_FILTER $actual
 
-   if [ ! -f $expect ]; then
-      # Create the expect file if it doesn't yet exist.
-      echo " CREATED"
-      cp $actual $expect
-      echo "    Expected result (*.ls) missing"
-      nerrors="`expr $nerrors + 1`"
-   elif $CMP $expect $actual; then
-      echo " PASSED"
-   else
-      echo "*FAILED*"
-      echo "    Expected result (*.ls) differs from actual result (*.out)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
-   fi
-
-   # Clean up output file
-   if test -z "$HDF5_NOCLEANUP"; then
-      rm -f $actual $actual_sav
-   fi
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ls) missing"
+        nerrors="`expr $nerrors + 1`"
+    elif $CMP $expect $actual; then
+        echo " PASSED"
+    else
+        echo "*FAILED*"
+        echo "    Expected result (*.ls) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+        rm -f $actual $actual_sav
+    fi
 }
 
 # Single run of tool
@@ -258,30 +259,30 @@ CMPTEST()
     # any unexpected output from that stream too.
     TESTING $H5MKGRP $@
     (
-    cd $TESTDIR
-    $RUNSERIAL $H5MKGRP_BIN $@
+        cd $TESTDIR
+        $RUNSERIAL $H5MKGRP_BIN $@
     ) >$actual 2>$actual_err
     cat $actual_err >> $actual
 
-   if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-      echo " CREATED"
-      cp $actual $expect
-      echo "    Expected result (*.txt) missing"
-      nerrors="`expr $nerrors + 1`"
-   elif $CMP $expect $actual; then
-      echo " PASSED"
-   else
-      echo "*FAILED*"
-      echo "    Expected result (*.txt) differs from actual result (*.out)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
-   fi
-
-   # Clean up output file
-   if test -z "$HDF5_NOCLEANUP"; then
-      rm -f $actual $actual_err
-   fi
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.txt) missing"
+        nerrors="`expr $nerrors + 1`"
+    elif $CMP $expect $actual; then
+        echo " PASSED"
+    else
+        echo "*FAILED*"
+        echo "    Expected result (*.txt) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+        rm -f $actual $actual_err
+    fi
 }
 
 ##############################################################################
diff --git a/tools/test/perform/CMakeLists.txt b/tools/test/perform/CMakeLists.txt
index c05698e..3c45e85 100644
--- a/tools/test/perform/CMakeLists.txt
+++ b/tools/test/perform/CMakeLists.txt
@@ -73,6 +73,21 @@ else ()
 endif ()
 set_target_properties (iopipe PROPERTIES FOLDER perform)
 
+#-- Adding test for chunk_cache
+set (chunk_cache_SOURCES
+    ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/chunk_cache.c
+)
+add_executable (chunk_cache ${chunk_cache_SOURCES})
+target_include_directories (chunk_cache PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+if (NOT BUILD_SHARED_LIBS)
+  TARGET_C_PROPERTIES (chunk_cache STATIC)
+  target_link_libraries (chunk_cache PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+else ()
+  TARGET_C_PROPERTIES (chunk_cache SHARED)
+  target_link_libraries (chunk_cache PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+endif ()
+set_target_properties (chunk_cache PROPERTIES FOLDER perform)
+
 #-- Adding test for overhead
 set (overhead_SOURCES
     ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/overhead.c
diff --git a/tools/test/perform/Makefile.am b/tools/test/perform/Makefile.am
index 5a89a66..39800d7 100644
--- a/tools/test/perform/Makefile.am
+++ b/tools/test/perform/Makefile.am
@@ -50,12 +50,12 @@ if BUILD_PARALLEL_CONDITIONAL
     TEST_PROG_PARA=h5perf perf
 endif
 # Serial test programs.
-TEST_PROG = iopipe chunk overhead zip_perf perf_meta h5perf_serial $(BUILD_ALL_PROGS)
+TEST_PROG = iopipe chunk chunk_cache overhead zip_perf perf_meta h5perf_serial $(BUILD_ALL_PROGS)
 
 # check_PROGRAMS will be built but not installed.  Do not any executable
 # that is in bin_PROGRAMS already. Otherwise, it will be removed twice in
 # "make clean" and some systems, e.g., AIX, do not like it.
-check_PROGRAMS= iopipe chunk overhead zip_perf perf_meta $(BUILD_ALL_PROGS) perf
+check_PROGRAMS= iopipe chunk chunk_cache overhead zip_perf perf_meta $(BUILD_ALL_PROGS) perf
 
 h5perf_SOURCES=pio_perf.c pio_engine.c
 h5perf_serial_SOURCES=sio_perf.c sio_engine.c
diff --git a/tools/test/perform/chunk_cache.c b/tools/test/perform/chunk_cache.c
new file mode 100644
index 0000000..d7c56af
--- /dev/null
+++ b/tools/test/perform/chunk_cache.c
@@ -0,0 +1,394 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ *  Purpose: check the performance of chunk cache in these two cases (HDFFV-10601):
+ *          1. partial chunks exist along any dimension.
+ *          2. number of slots in chunk cache is smaller than the number of chunks
+ *             in the fastest-growing dimension.
+ */
+#include "hdf5.h"
+#include "H5private.h"
+#include "h5test.h"
+
+#define FILENAME    "chunk_cache_perf.h5"
+
+#define RANK        2
+
+#define DSET1_NAME  "partial_chunks"
+#define DSET1_DIM1   9 * 1000
+#define DSET1_DIM2   9
+#define CHUNK1_DIM1  2 * 1000
+#define CHUNK1_DIM2  2
+
+#define DSET2_NAME  "hash_value"
+#define DSET2_DIM1   300
+#define DSET2_DIM2   600
+#define CHUNK2_DIM1  100
+#define CHUNK2_DIM2  100
+
+#define RDCC_NSLOTS  5
+#define RDCC_NBYTES  1024 * 1024 * 10
+#define RDCC_W0      0.75F
+
+#define FILTER_COUNTER    306
+static size_t    nbytes_global;
+
+typedef struct test_time_t {
+    long tv_sec;
+    long tv_usec;
+} test_time_t;
+
+/* Local function prototypes for the dummy filter */
+static size_t
+counter (unsigned flags, size_t cd_nelmts,
+         const unsigned *cd_values, size_t nbytes,
+         size_t *buf_size, void **buf);
+
+/* This message derives from H5Z */
+const H5Z_class2_t H5Z_COUNTER[1] = {{
+    H5Z_CLASS_T_VERS,           /* H5Z_class_t version          */
+    FILTER_COUNTER,             /* Filter id number             */
+    1, 1,                       /* Encoding and decoding enabled */
+    "counter",                  /* Filter name for debugging    */
+    NULL,                       /* The "can apply" callback     */
+    NULL,                       /* The "set local" callback     */
+    counter,                    /* The actual filter function   */
+}};
+
+/*-------------------------------------------------------------------------
+ *      Count number of bytes but don't do anything else.  Keep
+ *      track of the data of chunks being read from file into memory.
+ */
+static size_t
+counter (unsigned H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
+         const unsigned H5_ATTR_UNUSED *cd_values, size_t nbytes,
+         size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf)
+{
+    nbytes_global += nbytes;
+    return nbytes;
+}
+
+/*---------------------------------------------------------------------------*/
+static void
+cleanup (void)
+{
+    if (!getenv ("HDF5_NOCLEANUP")) {
+        remove (FILENAME);
+    }
+}
+
+/*-------------------------------------------------------------------------------
+ *      Create a chunked dataset with partial chunks along either dimensions:
+ *          dataset dimension:  9000 x 9
+ *          chunk dimension:    2000 x 2
+ */
+static int create_dset1(hid_t file)
+{
+    hid_t        dataspace = H5I_INVALID_HID, dataset = H5I_INVALID_HID;
+    hid_t        dcpl = H5I_INVALID_HID;
+    hsize_t      dims[RANK]  = {DSET1_DIM1, DSET1_DIM2};
+    hsize_t      chunk_dims[RANK] = {CHUNK1_DIM1, CHUNK1_DIM2};
+    int          **data;                /* data for writing */
+
+    /* Create the data space. */
+    if((dataspace = H5Screate_simple (RANK, dims, NULL)) < 0)
+        goto error;
+
+    /* Modify dataset creation properties, i.e. enable chunking  */
+    if((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
+        goto error;
+    if(H5Pset_chunk (dcpl, RANK, chunk_dims) < 0)
+        goto error;
+
+    /* Set the dummy filter simply for counting the number of bytes being read into the memory */
+    if(H5Zregister(H5Z_COUNTER) < 0)
+        goto error;
+
+    if(H5Pset_filter(dcpl, FILTER_COUNTER, 0, 0, NULL) < 0)
+        goto error;
+
+    /* Create a new dataset within the file using chunk creation properties.  */
+    if((dataset = H5Dcreate2 (file, DSET1_NAME, H5T_NATIVE_INT, dataspace,
+                          H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        goto error;
+
+    /* Create & fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(data,  int,  DSET1_DIM1, DSET1_DIM2);
+    H5TEST_FILL_2D_ARRAY(data, int, DSET1_DIM1, DSET1_DIM2);
+
+
+    /* Write data to dataset */
+    if(H5Dwrite (dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
+                       H5P_DEFAULT, data) < 0)
+        goto error;
+
+    /* Close resources */
+    H5Dclose (dataset);
+    H5Pclose (dcpl);
+    H5Sclose (dataspace);
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Dclose (dataset);
+        H5Pclose (dcpl);
+        H5Sclose (dataspace);
+    } H5E_END_TRY;
+
+    return 1;
+}
+
+/*---------------------------------------------------------------------------
+ *      Create a chunked dataset for testing hash values:
+ *          dataset dimensions: 300 x 600
+ *          chunk dimensions:   100 x 100
+ */
+static int create_dset2(hid_t file)
+{
+    hid_t        dataspace = H5I_INVALID_HID, dataset = H5I_INVALID_HID;
+    hid_t        dcpl = H5I_INVALID_HID;
+    hsize_t      dims[RANK]  = {DSET2_DIM1, DSET2_DIM2};
+    hsize_t      chunk_dims[RANK] = {CHUNK2_DIM1, CHUNK2_DIM2};
+    int          **data;                /* data for writing */
+
+    /* Create the data space. */
+    if((dataspace = H5Screate_simple(RANK, dims, NULL)) < 0)
+        goto error;
+
+    /* Modify dataset creation properties, i.e. enable chunking  */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto error;
+    if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
+        goto error;
+
+    /* Set the dummy filter simply for counting the number of bytes being read into the memory */
+    if(H5Zregister(H5Z_COUNTER) < 0)
+        goto error;
+    if(H5Pset_filter(dcpl, FILTER_COUNTER, 0, 0, NULL) < 0)
+        goto error;
+
+    /* Create a new dataset within the file using chunk creation properties.  */
+    if((dataset = H5Dcreate2(file, DSET2_NAME, H5T_NATIVE_INT, dataspace,
+                          H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        goto error;
+
+    /* Create & fill array */
+    H5TEST_ALLOCATE_2D_ARRAY(data,  int,  DSET2_DIM1, DSET2_DIM2);
+    H5TEST_FILL_2D_ARRAY(data, int, DSET2_DIM1, DSET2_DIM2);
+
+    /* Write data to dataset */
+    if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+        goto error;
+
+    /* Close resources */
+    H5Dclose(dataset);
+    H5Pclose(dcpl);
+    H5Sclose(dataspace);
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Dclose(dataset);
+        H5Pclose(dcpl);
+        H5Sclose(dataspace);
+    } H5E_END_TRY;
+
+    return 1;
+}
+
+/*---------------------------------------------------------------------------
+ *      Check the performance of the chunk cache when partial chunks exist
+ *      along the dataset dimensions.
+ */
+static int check_partial_chunks_perf(hid_t file)
+{
+    hid_t        dataset = H5I_INVALID_HID;
+    hid_t        filespace = H5I_INVALID_HID;
+    hid_t        memspace = H5I_INVALID_HID;
+    hid_t        dapl = H5I_INVALID_HID;
+
+    int          rdata[DSET1_DIM2];   /* data for reading */
+    int          i;
+
+    hsize_t      row_rank = 1;
+    hsize_t      row_dim[1] = {DSET1_DIM2};
+    hsize_t      start[RANK] = {0, 0};
+    hsize_t      count[RANK] = {1, DSET1_DIM2};
+    double       start_t, end_t;
+
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+        goto error;
+    if(H5Pset_chunk_cache (dapl, RDCC_NSLOTS, RDCC_NBYTES, RDCC_W0) < 0)
+        goto error;
+
+    dataset = H5Dopen2 (file, DSET1_NAME, dapl);
+
+    H5_CHECK_OVERFLOW(row_rank, hsize_t, int);
+    memspace = H5Screate_simple((int)row_rank, row_dim, NULL);
+    filespace = H5Dget_space(dataset);
+
+    nbytes_global = 0;
+
+    start_t = H5_get_time();
+
+    /* Read the data row by row */
+    for(i = 0; i < DSET1_DIM1; i++) {
+        start[0] = (hsize_t)i;
+        if(H5Sselect_hyperslab(filespace, H5S_SELECT_SET,
+                                     start, NULL, count, NULL) < 0)
+            goto error;
+
+        if(H5Dread (dataset, H5T_NATIVE_INT, memspace, filespace,
+                          H5P_DEFAULT, rdata) < 0)
+            goto error;
+    }
+
+    end_t = H5_get_time();
+
+    if((end_t - start_t) > (double)0.0f)
+        printf("1. Partial chunks: total read time is %lf; number of bytes being read from file is %lu\n", (end_t -start_t), nbytes_global);
+    else
+        printf("1. Partial chunks: no total read time because timer is not available; number of bytes being read from file is %lu\n", nbytes_global);
+
+    H5Dclose (dataset);
+    H5Sclose (filespace);
+    H5Sclose (memspace);
+    H5Pclose (dapl);
+
+    return 0;
+error:
+    H5E_BEGIN_TRY {
+        H5Dclose (dataset);
+        H5Sclose (filespace);
+        H5Sclose (memspace);
+        H5Pclose (dapl);
+    } H5E_END_TRY;
+    return 1;
+}
+
+/*---------------------------------------------------------------------------
+ *      Check the performance of chunk cache when the number of cache slots
+ *      is smaller than the number of chunks along the fastest-growing
+ *      dimension of the dataset.
+ */
+static int check_hash_value_perf(hid_t file)
+{
+    hid_t        dataset = H5I_INVALID_HID;
+    hid_t        filespace = H5I_INVALID_HID;
+    hid_t        memspace = H5I_INVALID_HID;
+    hid_t        dapl = H5I_INVALID_HID;
+
+    int          rdata[DSET2_DIM1];   /* data for reading */
+    int          i;
+
+    hsize_t      column_rank = 1;
+    hsize_t      column_dim[1] = {DSET2_DIM1};
+    hsize_t      start[RANK] = {0, 0};
+    hsize_t      count[RANK] = {DSET2_DIM1, 1};
+    double       start_t, end_t;
+
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+        goto error;
+    if(H5Pset_chunk_cache (dapl, RDCC_NSLOTS, RDCC_NBYTES, RDCC_W0) < 0)
+        goto error;
+
+    if((dataset = H5Dopen2 (file, DSET2_NAME, dapl)) < 0)
+        goto error;
+
+    H5_CHECK_OVERFLOW(column_rank, hsize_t, int);
+    if((memspace = H5Screate_simple((int)column_rank, column_dim, NULL)) < 0)
+        goto error;
+    if((filespace = H5Dget_space(dataset)) < 0)
+        goto error;
+
+    nbytes_global = 0;
+
+    start_t = H5_get_time();
+
+    /* Read the data column by column */
+    for(i = 0; i < DSET2_DIM2; i++) {
+        start[1] = (hsize_t)i;
+        if(H5Sselect_hyperslab(filespace, H5S_SELECT_SET,
+                                     start, NULL, count, NULL) < 0)
+            goto error;
+
+        if(H5Dread (dataset, H5T_NATIVE_INT, memspace, filespace,
+                          H5P_DEFAULT, rdata) < 0)
+            goto error;
+    }
+
+    end_t = H5_get_time();
+
+    if((end_t - start_t) > (double)0.0f)
+        printf("2. Hash value: total read time is %lf; number of bytes being read from file is %lu\n", (end_t -start_t), nbytes_global);
+    else
+        printf("2. Hash value: no total read time because timer is not available; number of bytes being read from file is %lu\n", nbytes_global);
+
+    H5Dclose (dataset);
+    H5Sclose (filespace);
+    H5Sclose (memspace);
+    H5Pclose (dapl);
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Dclose (dataset);
+        H5Sclose (filespace);
+        H5Sclose (memspace);
+        H5Pclose (dapl);
+    } H5E_END_TRY;
+    return 1;
+}
+
+/*-------------------------------------------------------------------------------------
+ *  Purpose: check the performance of chunk cache in these two cases (HDFFV-10601):
+ *          1. partial chunks exist along any dimension.
+ *          2. number of slots in chunk cache is smaller than the number of chunks
+ *             in the fastest-growing dimension.
+ *-------------------------------------------------------------------------------------*/
+int
+main (void)
+{
+    hid_t        file;                          /* handles */
+    int          nerrors = 0;
+
+    /* Create a new file. If file exists its contents will be overwritten. */
+    if((file = H5Fcreate (FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+
+    nerrors += create_dset1(file);
+    nerrors += create_dset2(file);
+
+    if(H5Fclose (file) < 0)
+        goto error;
+
+    /* Re-open the file for testing performance. */
+    if((file = H5Fopen (FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        goto error;
+
+    nerrors += check_partial_chunks_perf(file);
+    nerrors += check_hash_value_perf(file);
+
+    if(H5Fclose (file) < 0)
+        goto error;
+
+    if (nerrors>0) goto error;
+    cleanup();
+    return 0;
+
+error:
+    fprintf(stderr, "*** ERRORS DETECTED ***\n");
+    return 1;
+}
diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c
index bf4728d..bb74a1b 100644
--- a/tools/test/perform/iopipe.c
+++ b/tools/test/perform/iopipe.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
+ * Programmer:  Robb Matzke
  *              Thursday, March 12, 1998
  */
 
@@ -21,10 +21,6 @@
 
 #include "H5private.h"
 
-#ifdef H5_HAVE_SYS_TIMEB
-#include <sys/timeb.h>
-#endif
-
 
 #define RAW_FILE_NAME  "iopipe.raw"
 #define HDF5_FILE_NAME  "iopipe.h5"
@@ -56,25 +52,18 @@
  * Programmer:  Robb Matzke
  *              Thursday, March 12, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-#ifdef H5_HAVE_GETRUSAGE
 static void
-print_stats (const char *prefix,
+print_stats(const char *prefix,
+#ifdef H5_HAVE_GETRUSAGE
        struct rusage *r_start, struct rusage *r_stop,
-       struct timeval *t_start, struct timeval *t_stop,
-       size_t nbytes)
-#else /* H5_HAVE_GETRUSAGE */
-static void
-print_stats (const char *prefix,
-       struct timeval *r_start, struct timeval *r_stop,
-       struct timeval *t_start, struct timeval *t_stop,
-       size_t nbytes)
 #endif /* H5_HAVE_GETRUSAGE */
+       double t_start, double t_stop,
+       size_t nbytes)
 {
-    double  e_time, bw;
+    double  e_time;
+    char bw[16];
 #ifdef H5_HAVE_GETRUSAGE
     double  u_time, s_time;
 
@@ -88,27 +77,16 @@ print_stats (const char *prefix,
        ((double)(r_start->ru_stime.tv_sec)+
         (double)(r_start->ru_stime.tv_usec)/(double)1000000.0F);
 #endif
-#ifndef H5_HAVE_SYS_TIMEB
-    e_time = ((double)(t_stop->tv_sec)+
-        (double)(t_stop->tv_usec)/(double)1000000.0F) -
-       ((double)(t_start->tv_sec)+
-        (double)(t_start->tv_usec)/(double)1000000.0F);
-#else
-    e_time = ((double)(t_stop->tv_sec)+
-        (double)(t_stop->tv_usec)/(double)1000.0F) -
-       ((double)(t_start->tv_sec)+
-        (double)(t_start->tv_usec)/(double)1000.0F);
-#endif
-    bw = (double)nbytes / e_time;
+    e_time = t_stop - t_start;
+    H5_bandwidth(bw, (double)nbytes, e_time);
 
 #ifdef H5_HAVE_GETRUSAGE
-    printf (HEADING "%1.2fuser %1.2fsystem %1.2felapsed %1.2fMB/s\n",
-      prefix, u_time, s_time, e_time, bw/(1024*1024));
+    HDprintf(HEADING "%1.2fuser %1.2fsystem %1.2felapsed %s\n",
+      prefix, u_time, s_time, e_time, bw);
 #else
-    printf (HEADING "%1.2felapsed %1.2fMB/s\n",
-      prefix, e_time, bw/(1024*1024));
+    HDprintf(HEADING "%1.2felapsed %s\n",
+      prefix, e_time, bw);
 #endif
-
 }
 
 
@@ -122,12 +100,10 @@ print_stats (const char *prefix,
  * Programmer:  Robb Matzke
  *              Thursday, March 12, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
-synchronize (void)
+synchronize(void)
 {
 #ifdef H5_HAVE_SYSTEM
 #if defined(H5_HAVE_WIN32_API) && ! defined(__CYGWIN__)
@@ -157,24 +133,20 @@ synchronize (void)
  * Programmer:  Robb Matzke
  *              Thursday, March 12, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
-main (void)
+main(void)
 {
-    static hsize_t  size[2] = {REQUEST_SIZE_X, REQUEST_SIZE_Y};
-    static unsigned  nread = NREAD_REQUESTS, nwrite = NWRITE_REQUESTS;
+    hsize_t  size[2] = {REQUEST_SIZE_X, REQUEST_SIZE_Y};
+    unsigned  nread = NREAD_REQUESTS, nwrite = NWRITE_REQUESTS;
 
     unsigned char  *the_data = NULL;
     hid_t    file, dset, file_space = H5I_INVALID_HID;
 #ifdef H5_HAVE_GETRUSAGE
     struct rusage  r_start, r_stop;
-#else
-    struct timeval r_start, r_stop;
 #endif
-    struct timeval  t_start, t_stop;
+    double  t_start, t_stop;
     int      fd;
     unsigned    u;
     herr_t      H5_ATTR_NDEBUG_UNUSED status;
@@ -184,322 +156,221 @@ main (void)
     hsize_t    count[2];
 
 
-#ifdef H5_HAVE_SYS_TIMEB
-  struct _timeb *tbstart = malloc(sizeof(struct _timeb));
-  struct _timeb *tbstop = malloc(sizeof(struct _timeb));
-#endif
     /*
      * The extra cast in the following statement is a bug workaround for the
      * Win32 version 5.0 compiler.
      * 1998-11-06 ptl
      */
-    printf ("I/O request size is %1.1fMB\n",
-      (double)(hssize_t)(size[0]*size[1])/(double)1024.0F*(double)1024);
+    HDprintf("I/O request size is %1.1fMB\n",
+      (double)(hssize_t)(size[0] * size[1]) / (double)1024.0F * (double)1024);
 
     /* Open the files */
-    file = H5Fcreate (HDF5_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert (file>=0);
-    fd = HDopen (RAW_FILE_NAME, O_RDWR|O_CREAT|O_TRUNC, 0666);
-    HDassert (fd>=0);
+    file = H5Fcreate(HDF5_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    HDassert(file >= 0);
+    fd = HDopen(RAW_FILE_NAME, O_RDWR|O_CREAT|O_TRUNC, 0666);
+    HDassert(fd >= 0);
 
     /* Create the dataset */
-    file_space = H5Screate_simple (2, size, size);
+    file_space = H5Screate_simple(2, size, size);
     HDassert(file_space >= 0);
     dset = H5Dcreate2(file, "dset", H5T_NATIVE_UCHAR, file_space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     HDassert(dset >= 0);
-    the_data = (unsigned char *)malloc((size_t)(size[0] * size[1]));
+    the_data = (unsigned char *)HDmalloc((size_t)(size[0] * size[1]));
 
     /* initial fill for lazy malloc */
     HDmemset(the_data, 0xAA, (size_t)(size[0] * size[1]));
 
+
     /* Fill raw */
-    synchronize ();
+    synchronize();
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_start, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstart);
-#endif
-#endif
-    HDfprintf (stderr, HEADING, "fill raw");
+    t_start = H5_get_time();
+    HDfprintf(stderr, HEADING, "fill raw");
     for(u = 0; u < nwrite; u++) {
-  putc (PROGRESS, stderr);
-  HDfflush(stderr);
-  HDmemset(the_data, 0xAA, (size_t)(size[0]*size[1]));
+      HDputc(PROGRESS, stderr);
+      HDfflush(stderr);
+      HDmemset(the_data, 0xAA, (size_t)(size[0] * size[1]));
     }
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_stop);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_stop, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstop);
-  t_start.tv_sec = tbstart->time;
-  t_start.tv_usec = tbstart->millitm;
-  t_stop.tv_sec = tbstop->time;
-  t_stop.tv_usec = tbstop->millitm;
-#endif
-#endif
-    putc ('\n', stderr);
-    print_stats ("fill raw",
-     &r_start, &r_stop, &t_start, &t_stop,
-     (size_t)(nread*size[0]*size[1]));
+    t_stop = H5_get_time();
+    HDputc('\n', stderr);
+    print_stats("fill raw",
+#ifdef H5_HAVE_GETRUSAGE
+            &r_start, &r_stop,
+#endif /* H5_HAVE_GETRUSAGE */
+            t_start, t_stop, (size_t)(nread * size[0] * size[1]));
 
 
     /* Fill hdf5 */
-    synchronize ();
+    synchronize();
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_start, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstart);
-#endif
-#endif
-    HDfprintf (stderr, HEADING, "fill hdf5");
+    t_start = H5_get_time();
+    HDfprintf(stderr, HEADING, "fill hdf5");
     for(u = 0; u < nread; u++) {
-  putc (PROGRESS, stderr);
-  HDfflush(stderr);
-  status = H5Dread (dset, H5T_NATIVE_UCHAR, file_space, file_space,
-        H5P_DEFAULT, the_data);
-  HDassert (status>=0);
+      HDputc(PROGRESS, stderr);
+      HDfflush(stderr);
+      status = H5Dread(dset, H5T_NATIVE_UCHAR, file_space, file_space,
+            H5P_DEFAULT, the_data);
+      HDassert(status >= 0);
     }
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_stop);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_stop, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstop);
-  t_start.tv_sec = tbstart->time;
-  t_start.tv_usec = tbstart->millitm;
-  t_stop.tv_sec = tbstop->time;
-  t_stop.tv_usec = tbstop->millitm;
-#endif
-#endif
-    putc ('\n', stderr);
-    print_stats ("fill hdf5",
-     &r_start, &r_stop, &t_start, &t_stop,
-     (size_t)(nread*size[0]*size[1]));
+    t_stop = H5_get_time();
+    HDputc('\n', stderr);
+    print_stats("fill hdf5",
+#ifdef H5_HAVE_GETRUSAGE
+            &r_start, &r_stop,
+#endif /* H5_HAVE_GETRUSAGE */
+            t_start, t_stop, (size_t)(nread * size[0] * size[1]));
 
     /* Write the raw dataset */
-    synchronize ();
+    synchronize();
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_start, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstart);
-#endif
-#endif
-    HDfprintf (stderr, HEADING, "out raw");
+    t_start = H5_get_time();
+    HDfprintf(stderr, HEADING, "out raw");
     for(u = 0; u < nwrite; u++) {
-  putc (PROGRESS, stderr);
-  HDfflush(stderr);
-  offset = HDlseek (fd, (off_t)0, SEEK_SET);
-  HDassert (0==offset);
-  n = HDwrite (fd, the_data, (size_t)(size[0]*size[1]));
-  HDassert (n>=0 && (size_t)n==size[0]*size[1]);
+      HDputc(PROGRESS, stderr);
+      HDfflush(stderr);
+      offset = HDlseek(fd, (off_t)0, SEEK_SET);
+      HDassert(0 == offset);
+      n = HDwrite(fd, the_data, (size_t)(size[0] * size[1]));
+      HDassert(n >= 0 && (size_t)n == (size[0] * size[1]));
     }
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_stop);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_stop, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstop);
-  t_start.tv_sec = tbstart->time;
-  t_start.tv_usec = tbstart->millitm;
-  t_stop.tv_sec = tbstop->time;
-  t_stop.tv_usec = tbstop->millitm;
-#endif
-#endif
-    putc ('\n', stderr);
-    print_stats ("out raw",
-     &r_start, &r_stop, &t_start, &t_stop,
-     (size_t)(nread*size[0]*size[1]));
+    t_stop = H5_get_time();
+    HDputc('\n', stderr);
+    print_stats("out raw",
+#ifdef H5_HAVE_GETRUSAGE
+            &r_start, &r_stop,
+#endif /* H5_HAVE_GETRUSAGE */
+            t_start, t_stop, (size_t)(nread * size[0] * size[1]));
 
     /* Write the hdf5 dataset */
-    synchronize ();
+    synchronize();
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_start, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstart);
-#endif
-#endif
-    HDfprintf (stderr, HEADING, "out hdf5");
+    t_start = H5_get_time();
+    HDfprintf(stderr, HEADING, "out hdf5");
     for(u = 0; u < nwrite; u++) {
-  putc (PROGRESS, stderr);
-  HDfflush(stderr);
-  status = H5Dwrite (dset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL,
-         H5P_DEFAULT, the_data);
-  HDassert (status>=0);
+      HDputc(PROGRESS, stderr);
+      HDfflush(stderr);
+      status = H5Dwrite(dset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL,
+             H5P_DEFAULT, the_data);
+      HDassert(status >= 0);
     }
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_stop);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_stop, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstop);
-  t_start.tv_sec = tbstart->time;
-  t_start.tv_usec = tbstart->millitm;
-  t_stop.tv_sec = tbstop->time;
-  t_stop.tv_usec = tbstop->millitm;
-#endif
-#endif
-    putc ('\n', stderr);
-    print_stats ("out hdf5",
-     &r_start, &r_stop, &t_start, &t_stop,
-     (size_t)(nread*size[0]*size[1]));
+    t_stop = H5_get_time();
+    HDputc('\n', stderr);
+    print_stats("out hdf5",
+#ifdef H5_HAVE_GETRUSAGE
+            &r_start, &r_stop,
+#endif /* H5_HAVE_GETRUSAGE */
+            t_start, t_stop, (size_t)(nread * size[0] * size[1]));
 
     /* Read the raw dataset */
-    synchronize ();
+    synchronize();
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_start, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstart);
-#endif
-#endif
-    HDfprintf (stderr, HEADING, "in raw");
+    t_start = H5_get_time();
+    HDfprintf(stderr, HEADING, "in raw");
     for(u = 0; u < nread; u++) {
-  putc (PROGRESS, stderr);
-  HDfflush(stderr);
-  offset = HDlseek (fd, (off_t)0, SEEK_SET);
-  HDassert (0==offset);
-  n = HDread (fd, the_data, (size_t)(size[0]*size[1]));
-  HDassert (n>=0 && (size_t)n==size[0]*size[1]);
+      HDputc(PROGRESS, stderr);
+      HDfflush(stderr);
+      offset = HDlseek(fd, (off_t)0, SEEK_SET);
+      HDassert(0 == offset);
+      n = HDread(fd, the_data, (size_t)(size[0] * size[1]));
+      HDassert(n >= 0 && (size_t)n == (size[0] * size[1]));
     }
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_stop);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_stop, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstop);
-  t_start.tv_sec = tbstart->time;
-  t_start.tv_usec = tbstart->millitm;
-  t_stop.tv_sec = tbstop->time;
-  t_stop.tv_usec = tbstop->millitm;
-#endif
-#endif
-    putc ('\n', stderr);
-    print_stats ("in raw",
-     &r_start, &r_stop, &t_start, &t_stop,
-     (size_t)(nread*size[0]*size[1]));
+    t_stop = H5_get_time();
+    HDputc('\n', stderr);
+    print_stats("in raw",
+#ifdef H5_HAVE_GETRUSAGE
+            &r_start, &r_stop,
+#endif /* H5_HAVE_GETRUSAGE */
+            t_start, t_stop, (size_t)(nread * size[0] * size[1]));
 
 
     /* Read the hdf5 dataset */
-    synchronize ();
+    synchronize();
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_start, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstart);
-#endif
-#endif
-    HDfprintf (stderr, HEADING, "in hdf5");
+    t_start = H5_get_time();
+    HDfprintf(stderr, HEADING, "in hdf5");
     for(u = 0; u < nread; u++) {
-  putc (PROGRESS, stderr);
-  HDfflush(stderr);
-  status = H5Dread (dset, H5T_NATIVE_UCHAR, file_space, file_space,
-        H5P_DEFAULT, the_data);
-  HDassert (status>=0);
+      HDputc(PROGRESS, stderr);
+      HDfflush(stderr);
+      status = H5Dread(dset, H5T_NATIVE_UCHAR, file_space, file_space,
+            H5P_DEFAULT, the_data);
+      HDassert(status >= 0);
     }
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_stop);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_stop, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstop);
-  t_start.tv_sec = tbstart->time;
-  t_start.tv_usec = tbstart->millitm;
-  t_stop.tv_sec = tbstop->time;
-  t_stop.tv_usec = tbstop->millitm;
-#endif
-#endif
-    putc ('\n', stderr);
-    print_stats ("in hdf5",
-     &r_start, &r_stop, &t_start, &t_stop,
-     (size_t)(nread*size[0]*size[1]));
+    t_stop = H5_get_time();
+    HDputc('\n', stderr);
+    print_stats("in hdf5",
+#ifdef H5_HAVE_GETRUSAGE
+            &r_start, &r_stop,
+#endif /* H5_HAVE_GETRUSAGE */
+            t_start, t_stop, (size_t)(nread * size[0] * size[1]));
 
     /* Read hyperslab */
-    HDassert (size[0]>20 && size[1]>20);
+    HDassert(size[0] > 20 && size[1] > 20);
     start[0] = start[1] = 10;
-    count[0] = count[1] = size[0]-20;
-    status = H5Sselect_hyperslab (file_space, H5S_SELECT_SET, start, NULL, count, NULL);
-    HDassert (status>=0);
-    synchronize ();
+    count[0] = count[1] = size[0] - 20;
+    status = H5Sselect_hyperslab(file_space, H5S_SELECT_SET, start, NULL, count, NULL);
+    HDassert(status >= 0);
+    synchronize();
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_start, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstart);
-#endif
-#endif
-    HDfprintf (stderr, HEADING, "in hdf5 partial");
+    t_start = H5_get_time();
+    HDfprintf(stderr, HEADING, "in hdf5 partial");
     for(u = 0; u < nread; u++) {
-  putc (PROGRESS, stderr);
-  HDfflush(stderr);
-  status = H5Dread (dset, H5T_NATIVE_UCHAR, file_space, file_space,
-        H5P_DEFAULT, the_data);
-  HDassert (status>=0);
+      HDputc(PROGRESS, stderr);
+      HDfflush(stderr);
+      status = H5Dread(dset, H5T_NATIVE_UCHAR, file_space, file_space,
+            H5P_DEFAULT, the_data);
+      HDassert(status >= 0);
     }
 #ifdef H5_HAVE_GETRUSAGE
     HDgetrusage(RUSAGE_SELF, &r_stop);
 #endif
-#ifdef H5_HAVE_GETTIMEOFDAY
-    HDgettimeofday(&t_stop, NULL);
-#else
-#ifdef H5_HAVE_SYS_TIMEB
-  _ftime(tbstop);
-  t_start.tv_sec = tbstart->time;
-  t_start.tv_usec = tbstart->millitm;
-  t_stop.tv_sec = tbstop->time;
-  t_stop.tv_usec = tbstop->millitm;
-#endif
-#endif
-    putc('\n', stderr);
+    t_stop = H5_get_time();
+    HDputc('\n', stderr);
     print_stats("in hdf5 partial",
-     &r_start, &r_stop, &t_start, &t_stop,
-     (size_t)(nread*count[0]*count[1]));
-
-
+#ifdef H5_HAVE_GETRUSAGE
+            &r_start, &r_stop,
+#endif /* H5_HAVE_GETRUSAGE */
+            t_start, t_stop, (size_t)(nread * size[0] * size[1]));
 
     /* Close everything */
     HDclose(fd);
+
     H5Dclose(dset);
     H5Sclose(file_space);
     H5Fclose(file);
-    free(the_data);
+
+    HDfree(the_data);
 
     return 0;
 }
diff --git a/tools/test/perform/overhead.c b/tools/test/perform/overhead.c
index 58558a5..bb3aff5 100644
--- a/tools/test/perform/overhead.c
+++ b/tools/test/perform/overhead.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
+ * Programmer:  Robb Matzke
  *              Monday, September 28, 1998
  *
  * Purpose:  Creates a chunked dataset and measures the storage overhead.
diff --git a/tools/test/perform/perf_meta.c b/tools/test/perform/perf_meta.c
index b56f074..77248cc 100644
--- a/tools/test/perform/perf_meta.c
+++ b/tools/test/perform/perf_meta.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Raymond Lu <slu@ncsa.uiuc.edu>
+ * Programmer:	Raymond Lu
  *		Friday, Oct 3, 2004
  *
  * Purpose:	Tests performance of metadata
diff --git a/tools/test/perform/sio_engine.c b/tools/test/perform/sio_engine.c
index 2562ab8..aa3a316 100644
--- a/tools/test/perform/sio_engine.c
+++ b/tools/test/perform/sio_engine.c
@@ -1268,8 +1268,7 @@ done:
  *      'temp' in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+H5_GCC_DIAG_OFF(format-nonliteral)
 static void
 do_cleanupfile(iotype iot, char *filename)
 {
@@ -1331,5 +1330,5 @@ do_cleanupfile(iotype iot, char *filename)
         }
     }
 }
-#pragma GCC diagnostic pop
+H5_GCC_DIAG_ON(format-nonliteral)
 
diff --git a/tools/test/perform/sio_perf.c b/tools/test/perform/sio_perf.c
index a56558e..d2eb3fc 100644
--- a/tools/test/perform/sio_perf.c
+++ b/tools/test/perform/sio_perf.c
@@ -303,7 +303,7 @@ typedef struct _minmax {
 
 /* local functions */
 static hsize_t parse_size_directive(const char *size);
-static struct options *parse_command_line(int argc, char *argv[]);
+static struct options *parse_command_line(int argc, const char *argv[]);
 static void run_test_loop(struct options *options);
 static int run_test(iotype iot, parameters parms, struct options *opts);
 static void output_all_info(minmax *mm, int count, int indent_level);
@@ -324,7 +324,7 @@ static void report_parameters(struct options *opts);
  * Modifications:
  */
 int
-main(int argc, char **argv)
+main(int argc, const char *argv[])
 {
     int exit_value = EXIT_SUCCESS;
     struct options *opts = NULL;
@@ -944,7 +944,7 @@ report_parameters(struct options *opts)
  *    Added multidimensional testing (Christian Chilan, April, 2008)
  */
 static struct options *
-parse_command_line(int argc, char *argv[])
+parse_command_line(int argc, const char *argv[])
 {
     int opt;
     struct options *cl_opts;
@@ -984,7 +984,7 @@ parse_command_line(int argc, char *argv[])
     cl_opts->h5_extendable = FALSE; /* Use extendable dataset */
     cl_opts->verify = FALSE;        /* No Verify data correctness by default */
 
-    while ((opt = get_option(argc, (const char **)argv, s_opts, l_opts)) != EOF) {
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
         case 'a':
             cl_opts->h5_alignment = parse_size_directive(opt_arg);
diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h
index 45f6d25..99e13bc 100644
--- a/tools/test/perform/sio_standalone.h
+++ b/tools/test/perform/sio_standalone.h
@@ -228,7 +228,7 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...);
 #define HDgetpwnam(S)           getpwnam(S)
 #define HDgetpwuid(U)           getpwuid(U)
 #define HDgetrusage(X,S)        getrusage(X,S)
-#define HDgets(S)               gets(S)
+/* Don't define a macro for gets() - it was removed in C11 */
 #ifdef H5_HAVE_WIN32_API
     H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
 #define HDgettimeofday(V,Z) Wgettimeofday(V,Z)
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index e301bb3..8f1f584 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -552,7 +552,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size,
  * Modifications:
  */
 int
-main(int argc, char **argv)
+main(int argc, const char *argv[])
 {
     unsigned long min_buf_size = 128 * ONE_KB, max_buf_size = ONE_MB;
     unsigned long file_size = 64 * ONE_MB;
@@ -563,7 +563,7 @@ main(int argc, char **argv)
     /* Initialize h5tools lib */
     h5tools_init();
 
-    while ((opt = get_option(argc, (const char **)argv, s_opts, l_opts)) > 0) {
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) > 0) {
         switch ((char)opt) {
         case '0': case '1': case '2':
         case '3': case '4': case '5':