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

[svn-r22099] Add reference file extensions in new tests.

Browse Source 
Remove "STAR" test as some platforms vary in interpretation.
Add new tets to windows legacy test script
This commit is contained in:
Allen Byrne
2012-03-20 08:54:52 -05:00
parent 67bea14483
commit 92f575b2bf
4 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/h5dump/testh5dump.sh.in
View File

@@ -797,7 +797,7 @@ TOOLTEST tarray7.ddl --enable-error-stack tarray7.h5
TOOLTEST tarray8.ddl --enable-error-stack tarray8.h5
# test for wildcards in filename (does not work with cmake)
TOOLTEST3 tstarfile.ddl --enable-error-stack -H -d Dataset1 tarr*.h5
# inconsistent across platforms TOOLTEST3 tstarfile.ddl --enable-error-stack -H -d Dataset1 tarr*.h5
TOOLTEST3 tqmarkfile.ddl --enable-error-stack -H -d Dataset1 tarray?.h5
TOOLTEST tmultifile.ddl --enable-error-stack -H -d Dataset1 tarray2.h5 tarray3.h5 tarray4.h5 tarray5.h5 tarray6.h5 tarray7.h5

43
tools/h5ls/testh5ls.sh.in
View File

@@ -25,7 +25,7 @@ H5LS_BIN=`pwd`/$H5LS # The path of the tool binary
CMP='cmp -s'
DIFF='diff -c'
CP='cp'
NLINES=20 # Max. lines of output to display if test fails
NLINES=20 # Max. lines of output to display if test fails
WORDS_BIGENDIAN="@WORDS_BIGENDIAN@"
@@ -211,7 +211,7 @@ TOOLTEST() {
# any unexpected output from that stream too.
TESTING $H5LS $@
(
cd $TESTDIR
cd $TESTDIR
$RUNSERIAL $H5LS_BIN "$@"
) >$actual 2>$actual_err
@@ -223,37 +223,37 @@ TOOLTEST() {
STDERR_FILTER $actual_err
cat $actual_err >> $actual
if [ $h5haveexitcode = 'yes' -a $exitcode -ne $retvalexpect ]; then
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
if [ yes = "$verbose" ]; then
echo "test returned with exit code $exitcode"
echo "test output: (up to $NLINES lines)"
head -$NLINES $actual
echo "***end of test output***"
echo ""
fi
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
if [ yes = "$verbose" ]; then
echo "test returned with exit code $exitcode"
echo "test output: (up to $NLINES lines)"
head -$NLINES $actual
echo "***end of test output***"
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
elif $CMP $expect $actual; then
echo " PASSED"
else
echo "*FAILED*"
echo " Expected result differs from actual result"
nerrors="`expr $nerrors + 1`"
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
echo " Expected result differs from actual result"
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
}
##############################################################################
##############################################################################
### T H E T E S T S ###
### T H E T E S T S ###
##############################################################################
##############################################################################
# prepare for test
@@ -325,9 +325,9 @@ TOOLTEST thlinks-nodangle-1.ls 0 -w80 --follow-symlinks --no-dangling-links thli
# test for wildcards in filename (does not work with cmake)
# this h5ls test script does not pass the filename properly like the h5dump test script???
#TOOLTEST tstarfile 0 -w80 t*link.h5
#TOOLTEST tqmarkfile 0 -w80 t?link.h5
TOOLTEST tmultifile 0 -w80 thlink.h5 tslink.h5
#TOOLTEST tstarfile.ls 0 -w80 t*link.h5
#TOOLTEST tqmarkfile.ls 0 -w80 t?link.h5
TOOLTEST tmultifile.ls 0 -w80 thlink.h5 tslink.h5
# tests for hard links
TOOLTEST thlink-1.ls 0 -w80 thlink.h5
@@ -337,11 +337,8 @@ TOOLTEST tcomp-1.ls 0 -w80 -r -d tcompound.h5
#test for the nested compound type
TOOLTEST tnestcomp-1.ls 0 -w80 -r -d tnestedcomp.h5
TOOLTEST tnestcomp-2.ls 0 -w80 -r -d -S tnestedcomp.h5
TOOLTEST tnestcomp-3.ls 0 -w80 -r -d -l tnestedcomp.h5
TOOLTEST tnestcomp-4.ls 0 -w80 -r -d -l -S tnestedcomp.h5
# test for loop detection

4
windows/tools/h5dump/testh5dump.bat
View File

@@ -513,8 +513,8 @@ rem ############################################################################
call :tooltest tarray8.ddl --enable-error-stack tarray8.h5
rem test for wildcards in filename (does not work with cmake)
call :tooltest3 tstarfile.ddl --enable-error-stack -H -d Dataset1 tarr*.h5
call :tooltest3 tqmarkfile.ddl --enable-error-stack -H -d Dataset1 tarray?.h5
rem call :tooltest3 tstarfile.ddl --enable-error-stack -H -d Dataset1 tarr*.h5
rem call :tooltest3 tqmarkfile.ddl --enable-error-stack -H -d Dataset1 tarray?.h5
call :tooltest tmultifile.ddl --enable-error-stack -H -d Dataset1 tarray2.h5 tarray3.h5 tarray4.h5 tarray5.h5 tarray6.h5 tarray7.h5
rem test for files with empty data

8
windows/tools/h5ls/testh5ls.bat
View File

@@ -161,6 +161,9 @@ rem ############################################################################
call :tooltest tgroup-1.ls 1 -w80 -r -g tgroup.h5
call :tooltest tgroup-2.ls 0 -w80 -g tgroup.h5/g1
rem test for files with groups that have long comments
call :tooltest tgrp_comments.ls 0 -w80 -v -g tgrp_comments.h5/glongcomment
rem test for displaying simple space datasets
call :tooltest tdset-1.ls 0 -w80 -r -d tdset.h5
@@ -205,6 +208,11 @@ rem ############################################################################
rem when used file with no dangling links - expected exit code 0
call :tooltest thlinks-nodangle-1.ls 0 -w80 --follow-symlinks --no-dangling-links thlink.h5
rem test for wildcards in filename (does not work with cmake)
rem TOOLTEST tstarfile.ls 0 -w80 t*link.h5
rem TOOLTEST tqmarkfile.ls 0 -w80 t?link.h5
call :tooltest tmultifile.ls 0 -w80 thlink.h5 tslink.h5
rem tests for hard links
call :tooltest thlink-1.ls 0 -w80 thlink.h5