philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for DAILYTEST-259 h5clear test failure

Browse Source 
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.
This commit is contained in:
Vailin Choi
2017-04-18 13:24:00 -05:00
parent 86dacce61f
commit 38e1b5980a
9 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MANIFEST
View File

@@ -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

BIN
tools/test/misc/testfiles/h5clear_log_v3.h5 Normal file
View File

Binary file not shown.

BIN
tools/test/misc/testfiles/mod_h5clear_mdc_image.h5 → tools/test/misc/testfiles/h5clear_mdc_image.h5
View File

Binary file not shown.

0
tools/test/misc/testfiles/orig_h5clear_sec2_v0.h5 → tools/test/misc/testfiles/h5clear_sec2_v0.h5
View File

0
tools/test/misc/testfiles/orig_h5clear_sec2_v2.h5 → tools/test/misc/testfiles/h5clear_sec2_v2.h5
View File

0
tools/test/misc/testfiles/orig_h5clear_sec2_v3.h5 → tools/test/misc/testfiles/h5clear_sec2_v3.h5
View File

BIN
tools/test/misc/testfiles/latest_h5clear_log_v3.h5 Normal file
View File

Binary file not shown.

BIN
tools/test/misc/testfiles/latest_h5clear_sec2_v3.h5 Normal file
View File

Binary file not shown.

84
tools/test/misc/testh5clear.sh.in
View File

@@ -66,10 +66,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()
@@ -119,8 +122,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
@@ -224,29 +227,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)
@@ -256,52 +257,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
#
#
#