Modifications based on review comments from pull request.

Made changes according to review comments and discussion with Allen.

1 files changed, 57 insertions, 47 deletions

diff --git a/tools/test/misc/testh5clear.sh.in b/tools/test/misc/testh5clear.sh.in
index a31b824..b855572 100644
--- a/tools/test/misc/testh5clear.sh.in
+++ b/tools/test/misc/testh5clear.sh.in
@@ -75,6 +75,7 @@ $SRC_H5CLEAR_TESTFILES/h5clear_log_v3.h5
 $SRC_H5CLEAR_TESTFILES/latest_h5clear_log_v3.h5
 $SRC_H5CLEAR_TESTFILES/latest_h5clear_sec2_v3.h5
 $SRC_H5CLEAR_TESTFILES/h5clear_mdc_image.h5
+$SRC_H5CLEAR_TESTFILES/mod_h5clear_mdc_image.h5
 "
 
 COPY_TESTFILES_TO_TESTDIR()
@@ -124,8 +125,8 @@ CLEAN_TESTFILES_AND_TESTDIR()
 # beginning with the word "Testing".
 #
 TESTING() {
-   SPACES="                                                                   "
-   echo "Testing $* $SPACES" | cut -c1-74 | tr -d '\012'
+   SPACES="                                                               "
+   echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 # $1 is the expected output
@@ -164,6 +165,7 @@ TOOLTEST_OUT() {
     # Run test.
     TESTING $H5CLEAR $option1 $option2 $fname
     (
+        cd $TESTDIR
         $RUNSERIAL $H5CLEAR_BIN $option1 $option2 $fname
     ) >$actual 2>$actual_err
     cp $actual $actual_sav
@@ -184,7 +186,10 @@ TOOLTEST_OUT() {
 OPEN_CHK() {
     fname=$1
     expected=$2
-    $OPENCHK_BIN $fname 2>/dev/null
+    (
+        cd $TESTDIR
+        $OPENCHK_BIN $fname 2>/dev/null
+    )
     actual=$?
     if test $actual -ne $expected; then
         echo "Unexpected return from $OPENCHK"
@@ -204,9 +209,11 @@ TOOLTEST() {
     ret_expected=$4
     #
     TESTING $H5CLEAR $option1 $option2 $fname
-    fname=$1
     # h5clear $option1 $option2 $fname
-    $RUNSERIAL $H5CLEAR_BIN $option1 $option2 $fname 2>/dev/null 1>/dev/null
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5CLEAR_BIN $option1 $option2 $fname 2>/dev/null 1>/dev/null
+    )
     if test $? -ne $ret_expected; then
         echo "*FAILED*"
         nerrors=`expr $nerrors + 1`
@@ -222,92 +229,95 @@ TOOLTEST() {
 ##############################################################################
 # prepare for testing
 COPY_TESTFILES_TO_TESTDIR
+# For Cmake
+$CP -f $TESTDIR/h5clear_sec2_v0.h5 $TESTDIR/orig_h5clear_sec2_v0.h5
+$CP -f $TESTDIR/h5clear_sec2_v2.h5 $TESTDIR/orig_h5clear_sec2_v2.h5
+$CP -f $TESTDIR/h5clear_sec2_v3.h5 $TESTDIR/orig_h5clear_sec2_v3.h5
 #
 #
 #
 # The following are tests to verify the expected output from h5clear
 # "h5clear -h"
-# "h5clear"                             (no options, no file)
-# "h5clear junk.h5"                     (no options, nonexisting file)
-# "h5clear h5clear_sec2_v3.h5"          (no options, existing file)
-# "h5clear -m"                          (valid 1 option, no file)
-# "h5clear -s junk.h5"                  (valid 1 option, nonexisting file)
-# "h5clear -m -s"                       (valid 2 options, no file)
-# "h5clear -m -s junk.h5"               (valid 2 options, nonexisting file)
-# "h5clear -m h5clear_sec2_v2.h5"       (valid 1 option, existing file, no cache image)
-# "h5clear -s -m h5clear_sec2_v0.h5"    (valid 2 options, existing file, no cache image)
+# "h5clear"                                 (no options, no file)
+# "h5clear junk.h5"                         (no options, nonexisting file)
+# "h5clear orig_h5clear_sec2_v3.h5"         (no options, existing file)
+# "h5clear -m"                              (valid 1 option, no file)
+# "h5clear -s junk.h5"                      (valid 1 option, nonexisting file)
+# "h5clear -m -s"                           (valid 2 options, no file)
+# "h5clear -m -s junk.h5"                   (valid 2 options, nonexisting file)
+# "h5clear -m orig_h5clear_sec2_v2.h5"      (valid 1 option, existing file, no cache image)
+# "h5clear -s -m orig_h5clear_sec2_v0.h5"   (valid 2 options, existing file, no cache image)
 TOOLTEST_OUT "" -h "" h5clear_usage.ddl
 TOOLTEST_OUT "" "" "" h5clear_usage.ddl
 TOOLTEST_OUT junk.h5 "" "" h5clear_usage.ddl
-TOOLTEST_OUT $TESTDIR/h5clear_sec2_v3.h5 "" "" h5clear_usage.ddl
+TOOLTEST_OUT orig_h5clear_sec2_v3.h5 "" "" h5clear_usage.ddl
 TOOLTEST_OUT "" -m "" h5clear_missing_file.ddl
 TOOLTEST_OUT junk.h5 -s "" h5clear_open_fail.ddl
 TOOLTEST_OUT "" -m -s h5clear_missing_file.ddl
 TOOLTEST_OUT junk.h5 -m -s h5clear_open_fail.ddl
-TOOLTEST_OUT $TESTDIR/h5clear_sec2_v2.h5 -m "" h5clear_no_mdc_image.ddl
-TOOLTEST_OUT $TESTDIR/h5clear_sec2_v0.h5 -s -m h5clear_no_mdc_image.ddl
+TOOLTEST_OUT orig_h5clear_sec2_v2.h5 -m "" h5clear_no_mdc_image.ddl
+TOOLTEST_OUT orig_h5clear_sec2_v0.h5 -s -m h5clear_no_mdc_image.ddl
 #
 #
 #
 # The following are tests to verify the expected exit code from h5clear:
+# "h5clear -m h5clear_mdc_image.h5"     (valid option, existing file, succeed exit code)
+# "h5clear --vers"                      (valid option, version #, succeed exit code)
 # "h5clear -k"                          (invalid 1 option, no file, fail exit code)
 # "h5clear -k junk.h5"                  (invalid 1 option, nonexisting file, fail exit code)
 # "h5clear -l h5clear_sec2_v2.h5"       (invalid 1 option, existing file, fail exit code)
 # "h5clear -m -k"                       (valid/invalid 2 options, nofile, fail exit code)
 # "h5clear -l -m"                       (invalid/valid 2 options, nofile, fail exit code)
-# "h5clear -m -k junk.h5"               (valid/invalid 2 options, nonexisting file, fail exit code)
+# "h5clear -m -l junk.h5"               (valid/invalid 2 options, nonexisting file, fail exit code)
 # "h5clear -l -m junk.h5"               (invalid/valid 2 options, nonexisting file, fail exit code)
-# "h5clear -m -k h5clear_sec2_v0.h5"    (valid/invalid 2 options, existing file, fail exit code)
+# "h5clear -m -l h5clear_sec2_v0.h5"    (valid/invalid 2 options, existing file, fail exit code)
 # "h5clear -l -m h5clear_sec2_v0.h5"    (invalid/valid 2 options, existing file, fail exit code)
+TOOLTEST h5clear_mdc_image.h5 -m "" $SUCCEED
+TOOLTEST "" --vers "" $SUCCEED
 TOOLTEST "" -k "" $FAIL
 TOOLTEST junk.h5 -k "" $FAIL
 TOOLTEST h5clear_sec2_v2.h5 -l "" $FAIL
 TOOLTEST "" -m -k $FAIL
 TOOLTEST "" -l -m $FAIL
-TOOLTEST junk.h5 -m -k $FAIL
+TOOLTEST junk.h5 -m -l $FAIL
 TOOLTEST junk.h5 -l -m $FAIL
-TOOLTEST $TESTDIR/h5clear_sec2_v0.h5 -m -k $FAIL
-TOOLTEST $TESTDIR/h5clear_sec2_v0.h5 -l -m $FAIL
-#
-# "h5clear --vers"                      (valid option, version #, succeed exit code)
-# "h5clear -m h5clear_mdc_image.h5"     (valid option, existing file, succeed exit code)
-TOOLTEST "" --vers "" $SUCCEED
-TOOLTEST $TESTDIR/h5clear_mdc_image.h5 -m "" $SUCCEED
+TOOLTEST h5clear_sec2_v0.h5 -m -l $FAIL
+TOOLTEST h5clear_sec2_v0.h5 -l -m $FAIL
 #
 #
 #
 # h5clear_mdc_image.h5 already has cache image removed earlier, verify the expected warning from h5clear:
-TOOLTEST_OUT $TESTDIR/h5clear_mdc_image.h5 -m "" h5clear_no_mdc_image.ddl
-TOOLTEST_OUT $TESTDIR/h5clear_mdc_image.h5 -s -m h5clear_no_mdc_image.ddl
+TOOLTEST_OUT mod_h5clear_mdc_image.h5 -m "" h5clear_no_mdc_image.ddl
+TOOLTEST_OUT mod_h5clear_mdc_image.h5 -s -m h5clear_no_mdc_image.ddl
 #
 #
 #
 # The following are tests to verify the status_flags field is cleared properly:
-OPEN_CHK $TESTDIR/h5clear_sec2_v3.h5 $FAIL
-TOOLTEST $TESTDIR/h5clear_sec2_v3.h5 -s "" $SUCCEED
-OPEN_CHK $TESTDIR/h5clear_sec2_v3.h5 $SUCCEED
+OPEN_CHK h5clear_sec2_v3.h5 $FAIL
+TOOLTEST h5clear_sec2_v3.h5 -s "" $SUCCEED
+OPEN_CHK h5clear_sec2_v3.h5 $SUCCEED
 #
-OPEN_CHK $TESTDIR/h5clear_log_v3.h5 $FAIL
-TOOLTEST $TESTDIR/h5clear_log_v3.h5 -s "" $SUCCEED
-OPEN_CHK $TESTDIR/h5clear_log_v3.h5 $SUCCEED
+OPEN_CHK h5clear_log_v3.h5 $FAIL
+TOOLTEST h5clear_log_v3.h5 -s "" $SUCCEED
+OPEN_CHK h5clear_log_v3.h5 $SUCCEED
 #
-OPEN_CHK $TESTDIR/latest_h5clear_sec2_v3.h5 $FAIL
-TOOLTEST $TESTDIR/latest_h5clear_sec2_v3.h5 -s "" $SUCCEED
-OPEN_CHK $TESTDIR/latest_h5clear_sec2_v3.h5 $SUCCEED
+OPEN_CHK latest_h5clear_sec2_v3.h5 $FAIL
+TOOLTEST latest_h5clear_sec2_v3.h5 -s "" $SUCCEED
+OPEN_CHK latest_h5clear_sec2_v3.h5 $SUCCEED
 #
-OPEN_CHK $TESTDIR/latest_h5clear_log_v3.h5 $FAIL
-TOOLTEST $TESTDIR/latest_h5clear_log_v3.h5 -s "" $SUCCEED
-OPEN_CHK $TESTDIR/latest_h5clear_log_v3.h5 $SUCCEED
+OPEN_CHK latest_h5clear_log_v3.h5 $FAIL
+TOOLTEST latest_h5clear_log_v3.h5 -s "" $SUCCEED
+OPEN_CHK latest_h5clear_log_v3.h5 $SUCCEED
 #
 # File open succeeds for the following 2 test files because the
 # library does not check status_flags for files with < v3 superblock:
-OPEN_CHK $TESTDIR/h5clear_sec2_v0.h5 $SUCCEED
-TOOLTEST $TESTDIR/h5clear_sec2_v0.h5 -s "" $SUCCEED
-OPEN_CHK $TESTDIR/h5clear_sec2_v0.h5 $SUCCEED
+OPEN_CHK h5clear_sec2_v0.h5 $SUCCEED
+TOOLTEST h5clear_sec2_v0.h5 -s "" $SUCCEED
+OPEN_CHK h5clear_sec2_v0.h5 $SUCCEED
 #
-OPEN_CHK $TESTDIR/h5clear_sec2_v2.h5 $SUCCEED
-TOOLTEST $TESTDIR/h5clear_sec2_v2.h5 -s "" $SUCCEED
-OPEN_CHK $TESTDIR/h5clear_sec2_v2.h5 $SUCCEED
+OPEN_CHK h5clear_sec2_v2.h5 $SUCCEED
+TOOLTEST h5clear_sec2_v2.h5 -s "" $SUCCEED
+OPEN_CHK h5clear_sec2_v2.h5 $SUCCEED
 #
 #
 #