mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-12-15 07:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modifications based on review comments from pull request.

Browse Source 
Made changes according to review comments and discussion with Allen.
This commit is contained in:
Vailin Choi 2017-04-19 22:51:39 -05:00
parent 22d54edf90
commit ddd8cf0e1c
4 changed files with 110 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@ -1478,6 +1478,7 @@
./tools/test/misc/testfiles/h5clear_sec2_v3.h5 ./tools/test/misc/testfiles/h5clear_sec2_v3.h5
./tools/test/misc/testfiles/latest_h5clear_log_v3.h5 ./tools/test/misc/testfiles/latest_h5clear_log_v3.h5
./tools/test/misc/testfiles/latest_h5clear_sec2_v3.h5 ./tools/test/misc/testfiles/latest_h5clear_sec2_v3.h5
./tools/test/misc/testfiles/mod_h5clear_mdc_image.h5
./tools/test/misc/testfiles/h5mkgrp_help.txt ./tools/test/misc/testfiles/h5mkgrp_help.txt
./tools/test/misc/testfiles/h5mkgrp_version.txt.in ./tools/test/misc/testfiles/h5mkgrp_version.txt.in
./tools/test/misc/h5perf_gentest.c ./tools/test/misc/h5perf_gentest.c

104
tools/test/misc/h5clear_gentest.c
View File

@ -140,7 +140,7 @@ error:
* status_flags properly so users can open the files afterwards. * status_flags properly so users can open the files afterwards.
* *
* Return: Success: 0 * Return: Success: 0
* Failure: 1 * Failure: 1
* *
* Programmer: Vailin Choi; July 2013 * Programmer: Vailin Choi; July 2013
* *
@ -165,65 +165,65 @@ main(void)
/* Create a copy of the file access property list */ /* Create a copy of the file access property list */
if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
goto error; goto error;
/* Copy the file access property list */ /* Copy the file access property list */
if((new_fapl = H5Pcopy(fapl)) < 0) if((new_fapl = H5Pcopy(fapl)) < 0)
goto error; goto error;
/* Set to latest library format */ /* Set to latest library format */
if(H5Pset_libver_bounds(new_fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) if(H5Pset_libver_bounds(new_fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
goto error; goto error;
/* Files created within this for loop will have v3 superblock and nonzero status_flags */ /* Files created within this for loop will have v3 superblock and nonzero status_flags */
for(new_format = FALSE; new_format <= TRUE; new_format++) { for(new_format = FALSE; new_format <= TRUE; new_format++) {
hid_t fapl2, my_fapl; /* File access property lists */ hid_t fapl2, my_fapl; /* File access property lists */
/* Set to use the appropriate file access property list */ /* Set to use the appropriate file access property list */
if(new_format) if(new_format)
fapl2 = new_fapl; fapl2 = new_fapl;
else else
fapl2 = fapl; fapl2 = fapl;
/* /*
* Create a sec2 file * Create a sec2 file
*/ */
if((my_fapl = H5Pcopy(fapl2)) < 0) if((my_fapl = H5Pcopy(fapl2)) < 0)
goto error; goto error;
/* Create the file */ /* Create the file */
sprintf(fname, "%s%s", new_format? "latest_":"", FILENAME[0]); sprintf(fname, "%s%s", new_format? "latest_":"", FILENAME[0]);
if((fid = H5Fcreate(fname, H5F_ACC_TRUNC | (new_format ? 0 : H5F_ACC_SWMR_WRITE), H5P_DEFAULT, my_fapl)) < 0) if((fid = H5Fcreate(fname, H5F_ACC_TRUNC | (new_format ? 0 : H5F_ACC_SWMR_WRITE), H5P_DEFAULT, my_fapl)) < 0)
goto error; goto error;
/* Flush the file */ /* Flush the file */
if(H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) if(H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0)
goto error; goto error;
/* Close the property list */ /* Close the property list */
if(H5Pclose(my_fapl) < 0) if(H5Pclose(my_fapl) < 0)
goto error; goto error;
/* /*
* Create a log file * Create a log file
*/ */
/* Create a copy of file access property list */ /* Create a copy of file access property list */
if((my_fapl = H5Pcopy(fapl2)) < 0) if((my_fapl = H5Pcopy(fapl2)) < 0)
goto error; goto error;
/* Setup the fapl for the log driver */ /* Setup the fapl for the log driver */
if(H5Pset_fapl_log(my_fapl, "append.log", (unsigned long long)H5FD_LOG_ALL, (size_t)(4 * KB)) < 0) if(H5Pset_fapl_log(my_fapl, "append.log", (unsigned long long)H5FD_LOG_ALL, (size_t)(4 * KB)) < 0)
goto error; goto error;
/* Create the file */ /* Create the file */
sprintf(fname, "%s%s", new_format? "latest_":"", FILENAME[1]); sprintf(fname, "%s%s", new_format? "latest_":"", FILENAME[1]);
if((fid = H5Fcreate(fname, H5F_ACC_TRUNC | (new_format ? 0 : H5F_ACC_SWMR_WRITE), H5P_DEFAULT, my_fapl)) < 0) if((fid = H5Fcreate(fname, H5F_ACC_TRUNC | (new_format ? 0 : H5F_ACC_SWMR_WRITE), H5P_DEFAULT, my_fapl)) < 0)
goto error; goto error;
/* Flush the file */ /* Flush the file */
if(H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) if(H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0)
goto error; goto error;
/* Close the property list */ /* Close the property list */
if(H5Pclose(my_fapl) < 0) if(H5Pclose(my_fapl) < 0)
goto error; goto error;
} /* end for */ } /* end for */
@ -231,38 +231,38 @@ main(void)
* Create a sec2 file with v0 superblock but nonzero status_flags * Create a sec2 file with v0 superblock but nonzero status_flags
*/ */
if((fid = H5Fcreate(FILENAME[2], H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) if((fid = H5Fcreate(FILENAME[2], H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
goto error; goto error;
/* Flush the file */ /* Flush the file */
if(H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) if(H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0)
goto error; goto error;
/* /*
* Create a sec2 file with v2 superblock but nonzero status_flags * Create a sec2 file with v2 superblock but nonzero status_flags
*/ */
if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
goto error; goto error;
if(H5Pset_shared_mesg_nindexes(fcpl, 1) < 0) if(H5Pset_shared_mesg_nindexes(fcpl, 1) < 0)
goto error; goto error;
if(H5Pset_shared_mesg_index(fcpl, 0, H5O_SHMESG_DTYPE_FLAG, 50) < 0) if(H5Pset_shared_mesg_index(fcpl, 0, H5O_SHMESG_DTYPE_FLAG, 50) < 0)
goto error; goto error;
if((fid = H5Fcreate(FILENAME[3], H5F_ACC_TRUNC, fcpl, fapl)) < 0) if((fid = H5Fcreate(FILENAME[3], H5F_ACC_TRUNC, fcpl, fapl)) < 0)
goto error; goto error;
/* Flush the file */ /* Flush the file */
if(H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) if(H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0)
goto error; goto error;
/* Close the property lists */ /* Close the property lists */
if(H5Pclose(fapl) < 0) if(H5Pclose(fapl) < 0)
goto error; goto error;
if(H5Pclose(new_fapl) < 0) if(H5Pclose(new_fapl) < 0)
goto error; goto error;
if(H5Pclose(fcpl) < 0) if(H5Pclose(fcpl) < 0)
goto error; goto error;
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);

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

Binary file not shown.

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

@ -73,6 +73,7 @@ $SRC_H5CLEAR_TESTFILES/h5clear_log_v3.h5
$SRC_H5CLEAR_TESTFILES/latest_h5clear_log_v3.h5 $SRC_H5CLEAR_TESTFILES/latest_h5clear_log_v3.h5
$SRC_H5CLEAR_TESTFILES/latest_h5clear_sec2_v3.h5 $SRC_H5CLEAR_TESTFILES/latest_h5clear_sec2_v3.h5
$SRC_H5CLEAR_TESTFILES/h5clear_mdc_image.h5 $SRC_H5CLEAR_TESTFILES/h5clear_mdc_image.h5
$SRC_H5CLEAR_TESTFILES/mod_h5clear_mdc_image.h5
" "
COPY_TESTFILES_TO_TESTDIR() COPY_TESTFILES_TO_TESTDIR()
@ -122,8 +123,8 @@ CLEAN_TESTFILES_AND_TESTDIR()
# beginning with the word "Testing". # beginning with the word "Testing".
# #
TESTING() { TESTING() {
SPACES=" " SPACES=" "
echo "Testing $* $SPACES" | cut -c1-74 | tr -d '\012' echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
} }
# $1 is the expected output # $1 is the expected output
@ -162,6 +163,7 @@ TOOLTEST_OUT() {
# Run test. # Run test.
TESTING $H5CLEAR $option1 $option2 $fname TESTING $H5CLEAR $option1 $option2 $fname
( (
cd $TESTDIR
$RUNSERIAL $H5CLEAR_BIN $option1 $option2 $fname $RUNSERIAL $H5CLEAR_BIN $option1 $option2 $fname
) >$actual 2>$actual_err ) >$actual 2>$actual_err
cp $actual $actual_sav cp $actual $actual_sav
@ -182,7 +184,10 @@ TOOLTEST_OUT() {
OPEN_CHK() { OPEN_CHK() {
fname=$1 fname=$1
expected=$2 expected=$2
$OPENCHK_BIN $fname 2>/dev/null (
cd $TESTDIR
$OPENCHK_BIN $fname 2>/dev/null
)
actual=$? actual=$?
if test $actual -ne $expected; then if test $actual -ne $expected; then
echo "Unexpected return from $OPENCHK" echo "Unexpected return from $OPENCHK"
@ -202,9 +207,11 @@ TOOLTEST() {
ret_expected=$4 ret_expected=$4
# #
TESTING $H5CLEAR $option1 $option2 $fname TESTING $H5CLEAR $option1 $option2 $fname
fname=$1
# h5clear $option1 $option2 $fname # 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 if test $? -ne $ret_expected; then
echo "*FAILED*" echo "*FAILED*"
nerrors=`expr $nerrors + 1` nerrors=`expr $nerrors + 1`
@ -220,92 +227,95 @@ TOOLTEST() {
############################################################################## ##############################################################################
# prepare for testing # prepare for testing
COPY_TESTFILES_TO_TESTDIR 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 # The following are tests to verify the expected output from h5clear
# "h5clear -h" # "h5clear -h"
# "h5clear" (no options, no file) # "h5clear" (no options, no file)
# "h5clear junk.h5" (no options, nonexisting file) # "h5clear junk.h5" (no options, nonexisting file)
# "h5clear h5clear_sec2_v3.h5" (no options, existing file) # "h5clear orig_h5clear_sec2_v3.h5" (no options, existing file)
# "h5clear -m" (valid 1 option, no file) # "h5clear -m" (valid 1 option, no file)
# "h5clear -s junk.h5" (valid 1 option, nonexisting file) # "h5clear -s junk.h5" (valid 1 option, nonexisting file)
# "h5clear -m -s" (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 -s junk.h5" (valid 2 options, nonexisting file)
# "h5clear -m h5clear_sec2_v2.h5" (valid 1 option, existing file, no cache image) # "h5clear -m orig_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 -s -m orig_h5clear_sec2_v0.h5" (valid 2 options, existing file, no cache image)
TOOLTEST_OUT "" -h "" h5clear_usage.ddl TOOLTEST_OUT "" -h "" h5clear_usage.ddl
TOOLTEST_OUT "" "" "" h5clear_usage.ddl TOOLTEST_OUT "" "" "" h5clear_usage.ddl
TOOLTEST_OUT junk.h5 "" "" 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 "" -m "" h5clear_missing_file.ddl
TOOLTEST_OUT junk.h5 -s "" h5clear_open_fail.ddl TOOLTEST_OUT junk.h5 -s "" h5clear_open_fail.ddl
TOOLTEST_OUT "" -m -s h5clear_missing_file.ddl TOOLTEST_OUT "" -m -s h5clear_missing_file.ddl
TOOLTEST_OUT junk.h5 -m -s h5clear_open_fail.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 orig_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_v0.h5 -s -m h5clear_no_mdc_image.ddl
# #
# #
# #
# The following are tests to verify the expected exit code from h5clear: # 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" (invalid 1 option, no file, fail exit code)
# "h5clear -k junk.h5" (invalid 1 option, nonexisting 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 -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 -m -k" (valid/invalid 2 options, nofile, fail exit code)
# "h5clear -l -m" (invalid/valid 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 -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) # "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 "" -k "" $FAIL
TOOLTEST junk.h5 -k "" $FAIL TOOLTEST junk.h5 -k "" $FAIL
TOOLTEST h5clear_sec2_v2.h5 -l "" $FAIL TOOLTEST h5clear_sec2_v2.h5 -l "" $FAIL
TOOLTEST "" -m -k $FAIL TOOLTEST "" -m -k $FAIL
TOOLTEST "" -l -m $FAIL TOOLTEST "" -l -m $FAIL
TOOLTEST junk.h5 -m -k $FAIL TOOLTEST junk.h5 -m -l $FAIL
TOOLTEST junk.h5 -l -m $FAIL TOOLTEST junk.h5 -l -m $FAIL
TOOLTEST $TESTDIR/h5clear_sec2_v0.h5 -m -k $FAIL TOOLTEST h5clear_sec2_v0.h5 -m -l $FAIL
TOOLTEST $TESTDIR/h5clear_sec2_v0.h5 -l -m $FAIL TOOLTEST 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: # 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 mod_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 -s -m h5clear_no_mdc_image.ddl
# #
# #
# #
# The following are tests to verify the status_flags field is cleared properly: # The following are tests to verify the status_flags field is cleared properly:
OPEN_CHK $TESTDIR/h5clear_sec2_v3.h5 $FAIL OPEN_CHK h5clear_sec2_v3.h5 $FAIL
TOOLTEST $TESTDIR/h5clear_sec2_v3.h5 -s "" $SUCCEED TOOLTEST h5clear_sec2_v3.h5 -s "" $SUCCEED
OPEN_CHK $TESTDIR/h5clear_sec2_v3.h5 $SUCCEED OPEN_CHK h5clear_sec2_v3.h5 $SUCCEED
# #
OPEN_CHK $TESTDIR/h5clear_log_v3.h5 $FAIL OPEN_CHK h5clear_log_v3.h5 $FAIL
TOOLTEST $TESTDIR/h5clear_log_v3.h5 -s "" $SUCCEED TOOLTEST h5clear_log_v3.h5 -s "" $SUCCEED
OPEN_CHK $TESTDIR/h5clear_log_v3.h5 $SUCCEED OPEN_CHK h5clear_log_v3.h5 $SUCCEED
# #
OPEN_CHK $TESTDIR/latest_h5clear_sec2_v3.h5 $FAIL OPEN_CHK latest_h5clear_sec2_v3.h5 $FAIL
TOOLTEST $TESTDIR/latest_h5clear_sec2_v3.h5 -s "" $SUCCEED TOOLTEST latest_h5clear_sec2_v3.h5 -s "" $SUCCEED
OPEN_CHK $TESTDIR/latest_h5clear_sec2_v3.h5 $SUCCEED OPEN_CHK latest_h5clear_sec2_v3.h5 $SUCCEED
# #
OPEN_CHK $TESTDIR/latest_h5clear_log_v3.h5 $FAIL OPEN_CHK latest_h5clear_log_v3.h5 $FAIL
TOOLTEST $TESTDIR/latest_h5clear_log_v3.h5 -s "" $SUCCEED TOOLTEST latest_h5clear_log_v3.h5 -s "" $SUCCEED
OPEN_CHK $TESTDIR/latest_h5clear_log_v3.h5 $SUCCEED OPEN_CHK latest_h5clear_log_v3.h5 $SUCCEED
# #
# File open succeeds for the following 2 test files because the # File open succeeds for the following 2 test files because the
# library does not check status_flags for files with < v3 superblock: # library does not check status_flags for files with < v3 superblock:
OPEN_CHK $TESTDIR/h5clear_sec2_v0.h5 $SUCCEED OPEN_CHK h5clear_sec2_v0.h5 $SUCCEED
TOOLTEST $TESTDIR/h5clear_sec2_v0.h5 -s "" $SUCCEED TOOLTEST h5clear_sec2_v0.h5 -s "" $SUCCEED
OPEN_CHK $TESTDIR/h5clear_sec2_v0.h5 $SUCCEED OPEN_CHK h5clear_sec2_v0.h5 $SUCCEED
# #
OPEN_CHK $TESTDIR/h5clear_sec2_v2.h5 $SUCCEED OPEN_CHK h5clear_sec2_v2.h5 $SUCCEED
TOOLTEST $TESTDIR/h5clear_sec2_v2.h5 -s "" $SUCCEED TOOLTEST h5clear_sec2_v2.h5 -s "" $SUCCEED
OPEN_CHK $TESTDIR/h5clear_sec2_v2.h5 $SUCCEED OPEN_CHK h5clear_sec2_v2.h5 $SUCCEED
# #
# #
# #