Fix for DAILYTEST-259 h5clear test failure

Deposit the test files in test/misc/testfiles for testh5clear.sh to use instead of depending on h5clear_gentest.
Tested on kituo, osx1010test, quail, platypus and ostrich.

9 files changed, 51 insertions, 44 deletions

diff --git a/MANIFEST b/MANIFEST
index 5710f6c..5f549f4 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1471,10 +1471,13 @@
 ./tools/test/misc/testfiles/h5clear_no_mdc_image.ddl
 ./tools/test/misc/testfiles/h5clear_open_fail.ddl
 ./tools/test/misc/testfiles/h5clear_usage.ddl
-./tools/test/misc/testfiles/mod_h5clear_mdc_image.h5
-./tools/test/misc/testfiles/orig_h5clear_sec2_v0.h5
-./tools/test/misc/testfiles/orig_h5clear_sec2_v2.h5
-./tools/test/misc/testfiles/orig_h5clear_sec2_v3.h5
+./tools/test/misc/testfiles/h5clear_log_v3.h5
+./tools/test/misc/testfiles/h5clear_mdc_image.h5
+./tools/test/misc/testfiles/h5clear_sec2_v0.h5
+./tools/test/misc/testfiles/h5clear_sec2_v2.h5
+./tools/test/misc/testfiles/h5clear_sec2_v3.h5
+./tools/test/misc/testfiles/latest_h5clear_log_v3.h5
+./tools/test/misc/testfiles/latest_h5clear_sec2_v3.h5
 ./tools/test/misc/testfiles/h5mkgrp_help.txt
 ./tools/test/misc/testfiles/h5mkgrp_version.txt.in
 ./tools/test/misc/h5perf_gentest.c
diff --git a/tools/test/misc/testfiles/h5clear_log_v3.h5 b/tools/test/misc/testfiles/h5clear_log_v3.h5
new file mode 100644
index 0000000..aed33a4
--- /dev/null
+++ b/tools/test/misc/testfiles/h5clear_log_v3.h5
diff --git a/tools/test/misc/testfiles/mod_h5clear_mdc_image.h5 b/tools/test/misc/testfiles/h5clear_mdc_image.h5
index 310134b..6ed8b70 100644
--- a/tools/test/misc/testfiles/mod_h5clear_mdc_image.h5
+++ b/tools/test/misc/testfiles/h5clear_mdc_image.h5
diff --git a/tools/test/misc/testfiles/orig_h5clear_sec2_v0.h5 b/tools/test/misc/testfiles/h5clear_sec2_v0.h5
index 571fd46..571fd46 100644
--- a/tools/test/misc/testfiles/orig_h5clear_sec2_v0.h5
+++ b/tools/test/misc/testfiles/h5clear_sec2_v0.h5
diff --git a/tools/test/misc/testfiles/orig_h5clear_sec2_v2.h5 b/tools/test/misc/testfiles/h5clear_sec2_v2.h5
index 92833e6..92833e6 100644
--- a/tools/test/misc/testfiles/orig_h5clear_sec2_v2.h5
+++ b/tools/test/misc/testfiles/h5clear_sec2_v2.h5
diff --git a/tools/test/misc/testfiles/orig_h5clear_sec2_v3.h5 b/tools/test/misc/testfiles/h5clear_sec2_v3.h5
index 9f1e6ce..9f1e6ce 100644
--- a/tools/test/misc/testfiles/orig_h5clear_sec2_v3.h5
+++ b/tools/test/misc/testfiles/h5clear_sec2_v3.h5
diff --git a/tools/test/misc/testfiles/latest_h5clear_log_v3.h5 b/tools/test/misc/testfiles/latest_h5clear_log_v3.h5
new file mode 100644
index 0000000..da5c426
--- /dev/null
+++ b/tools/test/misc/testfiles/latest_h5clear_log_v3.h5
diff --git a/tools/test/misc/testfiles/latest_h5clear_sec2_v3.h5 b/tools/test/misc/testfiles/latest_h5clear_sec2_v3.h5
new file mode 100644
index 0000000..e511248
--- /dev/null
+++ b/tools/test/misc/testfiles/latest_h5clear_sec2_v3.h5
diff --git a/tools/test/misc/testh5clear.sh.in b/tools/test/misc/testh5clear.sh.in
index 71d5cad..a31b824 100644
--- a/tools/test/misc/testh5clear.sh.in
+++ b/tools/test/misc/testh5clear.sh.in
@@ -68,10 +68,13 @@ $SRC_H5CLEAR_TESTFILES/h5clear_usage.ddl
 $SRC_H5CLEAR_TESTFILES/h5clear_open_fail.ddl
 $SRC_H5CLEAR_TESTFILES/h5clear_missing_file.ddl
 $SRC_H5CLEAR_TESTFILES/h5clear_no_mdc_image.ddl
-$SRC_H5CLEAR_TESTFILES/orig_h5clear_sec2_v0.h5
-$SRC_H5CLEAR_TESTFILES/orig_h5clear_sec2_v2.h5
-$SRC_H5CLEAR_TESTFILES/orig_h5clear_sec2_v3.h5
-$SRC_H5CLEAR_TESTFILES/mod_h5clear_mdc_image.h5
+$SRC_H5CLEAR_TESTFILES/h5clear_sec2_v0.h5
+$SRC_H5CLEAR_TESTFILES/h5clear_sec2_v2.h5
+$SRC_H5CLEAR_TESTFILES/h5clear_sec2_v3.h5
+$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
 "
 
 COPY_TESTFILES_TO_TESTDIR()
@@ -121,8 +124,8 @@ CLEAN_TESTFILES_AND_TESTDIR()
 # beginning with the word "Testing".
 #
 TESTING() {
-   SPACES="                                                               "
-   echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
+   SPACES="                                                                   "
+   echo "Testing $* $SPACES" | cut -c1-74 | tr -d '\012'
 }
 
 # $1 is the expected output
@@ -226,29 +229,27 @@ COPY_TESTFILES_TO_TESTDIR
 # "h5clear -h"
 # "h5clear"                             (no options, no file)
 # "h5clear junk.h5"                     (no options, nonexisting file)
-# "h5clear orig_h5clear_sec2_v3.h5"          (no options, existing 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 junk.h5"               (valid 2 options, no 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)
+# "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)
 TOOLTEST_OUT "" -h "" h5clear_usage.ddl
 TOOLTEST_OUT "" "" "" h5clear_usage.ddl
 TOOLTEST_OUT junk.h5 "" "" h5clear_usage.ddl
-TOOLTEST_OUT $TESTDIR/orig_h5clear_sec2_v3.h5 "" "" h5clear_usage.ddl
+TOOLTEST_OUT $TESTDIR/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/orig_h5clear_sec2_v2.h5 -m "" h5clear_no_mdc_image.ddl
-TOOLTEST_OUT $TESTDIR/orig_h5clear_sec2_v0.h5 -s -m h5clear_no_mdc_image.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
 #
 #
 #
 # 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)
@@ -258,52 +259,55 @@ TOOLTEST_OUT $TESTDIR/orig_h5clear_sec2_v0.h5 -s -m h5clear_no_mdc_image.ddl
 # "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 -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 -l $FAIL
+TOOLTEST junk.h5 -m -k $FAIL
 TOOLTEST junk.h5 -l -m $FAIL
-TOOLTEST h5clear_sec2_v0.h5 -m -l $FAIL
-TOOLTEST h5clear_sec2_v0.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
 #
 #
 #
 # h5clear_mdc_image.h5 already has cache image removed earlier, verify the expected warning from h5clear:
-TOOLTEST_OUT $TESTDIR/mod_h5clear_mdc_image.h5 -m "" h5clear_no_mdc_image.ddl
-TOOLTEST_OUT $TESTDIR/mod_h5clear_mdc_image.h5 -s -m h5clear_no_mdc_image.ddl
+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
 #
 #
 #
 # The following are tests to verify the status_flags field is cleared properly:
-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_sec2_v3.h5 $FAIL
+TOOLTEST $TESTDIR/h5clear_sec2_v3.h5 -s "" $SUCCEED
+OPEN_CHK $TESTDIR/h5clear_sec2_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/h5clear_log_v3.h5 $FAIL
+TOOLTEST $TESTDIR/h5clear_log_v3.h5 -s "" $SUCCEED
+OPEN_CHK $TESTDIR/h5clear_log_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_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_log_v3.h5 $FAIL
-TOOLTEST latest_h5clear_log_v3.h5 -s "" $SUCCEED
-OPEN_CHK latest_h5clear_log_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
 #
 # File open succeeds for the following 2 test files because the
 # library does not check status_flags for files with < v3 superblock:
-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_v0.h5 $SUCCEED
+TOOLTEST $TESTDIR/h5clear_sec2_v0.h5 -s "" $SUCCEED
+OPEN_CHK $TESTDIR/h5clear_sec2_v0.h5 $SUCCEED
 #
-OPEN_CHK h5clear_sec2_v2.h5 $SUCCEED
-TOOLTEST h5clear_sec2_v2.h5 -s "" $SUCCEED
-OPEN_CHK h5clear_sec2_v2.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
 #
 #
 #