mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-21 01:04:10 +08:00
Merge pull request #2733 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop
* commit 'be02566f49f953bc80c5b5018871138e201ea633': Fixes indenting in tools test scripts
This commit is contained in:
Dana Robinson
commit
f59bb712de
@ -200,6 +200,7 @@ TOOLTEST()
|
||||
fi
|
||||
runh5diff=no
|
||||
fi
|
||||
|
||||
if [ "$3" = -o ]; then
|
||||
outputfile=$4
|
||||
else
|
||||
@ -219,6 +220,7 @@ TOOLTEST()
|
||||
$RUNSERIAL $H5COPY_BIN $@
|
||||
) > $actualout 2> $actualerr
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ]; then
|
||||
echo "*FAILED*"
|
||||
echo "failed result is:"
|
||||
@ -268,6 +270,7 @@ TOOLTEST_PREFILL()
|
||||
$RUNSERIAL $H5COPY_BIN -i $inputfile -o $outputfile -v -s $grp_name -d $grp_name2
|
||||
) > $actualout 2> $actualerr
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ]; then
|
||||
echo "*FAILED*"
|
||||
echo "failed result is:"
|
||||
@ -282,6 +285,7 @@ TOOLTEST_PREFILL()
|
||||
$RUNSERIAL $H5COPY_BIN -i $inputfile -o $outputfile -v -s $obj_name -d $obj_name2
|
||||
) > $actualout 2> $actualerr
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ]; then
|
||||
echo "*FAILED*"
|
||||
echo "failed result is:"
|
||||
@ -313,6 +317,7 @@ TOOLTEST_SAME()
|
||||
else
|
||||
runh5diff=no
|
||||
fi
|
||||
|
||||
if [ "$3" = -o ]; then
|
||||
outputfile=$4
|
||||
else
|
||||
@ -330,6 +335,7 @@ TOOLTEST_SAME()
|
||||
$RUNSERIAL $H5COPY_BIN -i $inputfile -o $outputfile -v -s $grp_name -d $grp_name
|
||||
) > $actualout 2> $actualerr
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ]; then
|
||||
echo "*FAILED*"
|
||||
echo "failed result is:"
|
||||
@ -344,6 +350,7 @@ TOOLTEST_SAME()
|
||||
$RUNSERIAL $H5COPY_BIN -i $outputfile -o $outputfile -v -s $grp_name -d $grp_name2
|
||||
) > $actualout 2> $actualerr
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ]; then
|
||||
echo "*FAILED*"
|
||||
echo "failed result is:"
|
||||
@ -406,6 +413,7 @@ TOOLTEST_FAIL()
|
||||
if [ "$1" = -i ]; then
|
||||
inputfile=$2
|
||||
fi
|
||||
|
||||
if [ "$3" = -o ]; then
|
||||
outputfile=$4
|
||||
fi
|
||||
@ -417,8 +425,8 @@ TOOLTEST_FAIL()
|
||||
#echo "#############################"
|
||||
$RUNSERIAL $H5COPY_BIN $@
|
||||
) > $actualout 2> $actualerr
|
||||
|
||||
RET=$?
|
||||
|
||||
# save actualout and actualerr in case they are needed later.
|
||||
cp $actualout $actualout_sav
|
||||
STDOUT_FILTER $actualout
|
||||
|
||||
@ -135,24 +135,24 @@ CLEAN_TESTFILES_AND_TESTDIR()
|
||||
# -h print help page
|
||||
while [ $# -gt 0 ]; do
|
||||
case "$1" in
|
||||
-p) # reset the tool name and bin to run ph5diff tests
|
||||
TESTNAME=ph5diff
|
||||
H5DIFF=../../src/h5diff/ph5diff # The tool name
|
||||
H5DIFF_BIN=`pwd`/$H5DIFF # The path of the tool binary
|
||||
pmode=yes
|
||||
shift
|
||||
;;
|
||||
-p) # reset the tool name and bin to run ph5diff tests
|
||||
TESTNAME=ph5diff
|
||||
H5DIFF=../../src/h5diff/ph5diff # The tool name
|
||||
H5DIFF_BIN=`pwd`/$H5DIFF # The path of the tool binary
|
||||
pmode=yes
|
||||
shift
|
||||
;;
|
||||
-h) # print help page
|
||||
echo "$0 [-p] [-h]"
|
||||
echo " -p run ph5diff tests"
|
||||
echo " -h print help page"
|
||||
shift
|
||||
exit 0
|
||||
;;
|
||||
echo "$0 [-p] [-h]"
|
||||
echo " -p run ph5diff tests"
|
||||
echo " -h print help page"
|
||||
shift
|
||||
exit 0
|
||||
;;
|
||||
*) # unknown option
|
||||
echo "$0: Unknown option ($1)"
|
||||
exit 1
|
||||
;;
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
@ -218,19 +218,21 @@ TOOLTEST() {
|
||||
# Run test.
|
||||
TESTING $H5DIFF $@
|
||||
(
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
EXIT_CODE=$?
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
cp $actual $actual_sav
|
||||
STDOUT_FILTER $actual
|
||||
cp $actual_err $actual_err_sav
|
||||
STDERR_FILTER $actual_err
|
||||
cat $actual_err >> $actual
|
||||
|
||||
# don't add exit code check in pmode, as it causes failure. (exit code
|
||||
# is from mpirun not tool)
|
||||
# if any problem occurs relate to an exit code, it will be caught in
|
||||
@ -260,27 +262,29 @@ TOOLTEST() {
|
||||
actual_sorted=actual_sorted
|
||||
sort $expect -o $expect_sorted
|
||||
sort $actual -o $actual_sorted
|
||||
|
||||
# remove "EXIT CODE:" line from expect file. test for exit code
|
||||
# is done by serial mode.
|
||||
grep -v "EXIT CODE:" $expect_sorted > $expect_sorted.noexit
|
||||
mv $expect_sorted.noexit $expect_sorted
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
@ -306,18 +310,20 @@ TOOLTEST_ERR() {
|
||||
# Run test.
|
||||
TESTING $H5DIFF $@
|
||||
(
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
EXIT_CODE=$?
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
cp $actual $actual_sav
|
||||
STDOUT_FILTER $actual
|
||||
cp $actual_err $actual_err_sav
|
||||
STDERR_FILTER $actual_err
|
||||
|
||||
# don't add exit code check in pmode, as it causes failure. (exit code
|
||||
# is from mpirun not tool)
|
||||
# if any problem occurs relate to an exit code, it will be caught in
|
||||
@ -348,23 +354,24 @@ TOOLTEST_ERR() {
|
||||
sort $expect_err -o $expect_sorted
|
||||
sort $actual_err -o $actual_sorted
|
||||
mv $expect_sorted.noexit $expect_sorted
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
|
||||
@ -500,18 +500,20 @@ TOOLTEST() {
|
||||
# Run test.
|
||||
TESTING $H5DIFF $@
|
||||
(
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $RUNCMD $H5DIFF_BIN "$@"
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $RUNCMD $H5DIFF_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
EXIT_CODE=$?
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
cp $actual $actual_sav
|
||||
STDOUT_FILTER $actual
|
||||
cp $actual_err $actual_err_sav
|
||||
STDERR_FILTER $actual_err
|
||||
|
||||
# don't add exit code check in pmode, as it causes failure. (exit code
|
||||
# is from mpirun not tool)
|
||||
# if any problem occurs relate to an exit code, it will be caught in
|
||||
@ -545,23 +547,24 @@ TOOLTEST() {
|
||||
# is done by serial mode.
|
||||
grep -v "EXIT CODE:" $expect_sorted > $expect_sorted.noexit
|
||||
mv $expect_sorted.noexit $expect_sorted
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
|
||||
@ -181,8 +181,8 @@ TOOLTEST() {
|
||||
# Run test.
|
||||
TESTING $H5DUMP $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $H5DUMP_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $H5DUMP_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -192,24 +192,24 @@ TOOLTEST() {
|
||||
STDERR_FILTER $actual_err
|
||||
cat $actual_err >> $actual
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual > /dev/null 2>&1 ; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $caseless $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 $actual_ext
|
||||
rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
@ -465,14 +465,14 @@ TESTING() {
|
||||
TOOLTEST() {
|
||||
# check if caseless compare and diff requested
|
||||
if [ "$1" = ignorecase ]; then
|
||||
caseless="-i"
|
||||
# replace cmp with diff which runs much longer.
|
||||
xCMP="$DIFF -i"
|
||||
shift
|
||||
caseless="-i"
|
||||
# replace cmp with diff which runs much longer.
|
||||
xCMP="$DIFF -i"
|
||||
shift
|
||||
else
|
||||
caseless=""
|
||||
# stick with faster cmp if ignorecase is not requested.
|
||||
xCMP="$CMP"
|
||||
caseless=""
|
||||
# stick with faster cmp if ignorecase is not requested.
|
||||
xCMP="$CMP"
|
||||
fi
|
||||
|
||||
expect="$TESTDIR/$1"
|
||||
@ -485,8 +485,8 @@ TOOLTEST() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -495,24 +495,24 @@ TOOLTEST() {
|
||||
cp $actual_err $actual_err_sav
|
||||
STDERR_FILTER $actual_err
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $xCMP $expect $actual > /dev/null 2>&1 ; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $caseless $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 $actual_ext
|
||||
rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
|
||||
fi
|
||||
|
||||
}
|
||||
@ -534,41 +534,41 @@ TOOLTEST2() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expectdata $actualdata; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
elif $CMP $expect $actual; then
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expectdata $actualdata; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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 $actualdata $actual_err
|
||||
rm -f $actual $actualdata $actual_err
|
||||
fi
|
||||
|
||||
}
|
||||
@ -592,56 +592,55 @@ TOOLTEST2A() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $DIFF $expectdata $actualdata; then
|
||||
if [ ! -f $expectmeta ]; then
|
||||
# Create the expect meta file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualmeta $expectmeta
|
||||
echo " Expected metafile (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expectmeta $actualmeta; then
|
||||
echo " PASSED"
|
||||
elif $CMP $expect $actual; then
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $DIFF $expectdata $actualdata; then
|
||||
if [ ! -f $expectmeta ]; then
|
||||
# Create the expect meta file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualmeta $expectmeta
|
||||
echo " Expected metafile (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expectmeta $actualmeta; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected metafile (*.ddl) differs from actual metafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectmeta $actualmeta |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected metafile (*.ddl) differs from actual metafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectmeta $actualmeta |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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 $actualdata $actual_err $actualmeta
|
||||
rm -f $actual $actualdata $actual_err $actualmeta
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
# same as TOOLTEST2 but only compares the generated data file to the expected data file
|
||||
@ -658,28 +657,28 @@ TOOLTEST2B() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expectdata $actualdata; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actualdata $actual_err
|
||||
rm -f $actual $actualdata $actual_err
|
||||
fi
|
||||
|
||||
}
|
||||
@ -699,8 +698,8 @@ TOOLTEST3() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -719,23 +718,23 @@ TOOLTEST3() {
|
||||
$actual_err > $actual_ext
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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
|
||||
|
||||
}
|
||||
@ -757,8 +756,8 @@ TOOLTEST4() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -777,30 +776,30 @@ TOOLTEST4() {
|
||||
$actual_err > $actual_ext
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
if $CMP $expect_err $actual_ext; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.err) differs from actual result (*.oerr)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/ /'
|
||||
fi
|
||||
if $CMP $expect_err $actual_ext; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.err) differs from actual result (*.oerr)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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
|
||||
|
||||
}
|
||||
@ -822,8 +821,8 @@ TOOLTEST5() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -842,33 +841,33 @@ TOOLTEST5() {
|
||||
$actual_err > $actual_ext
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
if $CMP $expect_err $actual_ext; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.err) differs from actual result (*.oerr)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/ /'
|
||||
fi
|
||||
if $CMP $expect_err $actual_ext; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.err) differs from actual result (*.oerr)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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
|
||||
|
||||
}
|
||||
|
||||
# ADD_HELP_TEST
|
||||
TOOLTEST_HELP() {
|
||||
|
||||
@ -880,27 +879,27 @@ TOOLTEST_HELP() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect-CREATED
|
||||
echo " Expected output (*.txt) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect-CREATED
|
||||
echo " Expected output (*.txt) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected output (*.txt) differs from actual output (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
echo "*FAILED*"
|
||||
echo " Expected output (*.txt) differs from actual output (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
fi
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actual_err
|
||||
rm -f $actual $actual_err
|
||||
fi
|
||||
|
||||
}
|
||||
@ -920,14 +919,16 @@ GREPTEST()
|
||||
# Run test.
|
||||
TESTING $DUMPER -p $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
if [ "$txttype" = "ERRTXT" ]; then
|
||||
$GREP "$expectdata" $actual_err > /dev/null
|
||||
else
|
||||
$GREP "$expectdata" $actual > /dev/null
|
||||
fi
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
echo " PASSED"
|
||||
else
|
||||
@ -937,7 +938,7 @@ GREPTEST()
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actual_err
|
||||
rm -f $actual $actual_err
|
||||
fi
|
||||
}
|
||||
|
||||
@ -956,14 +957,16 @@ GREPTEST2()
|
||||
# Run test.
|
||||
TESTING $DUMPER -p $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
|
||||
cd $TESTDIR
|
||||
$ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
if [ "$txttype" = "ERRTXT" ]; then
|
||||
$GREP "$expectdata" $actual_err > /dev/null
|
||||
else
|
||||
$GREP "$expectdata" $actual > /dev/null
|
||||
fi
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
echo " PASSED"
|
||||
else
|
||||
@ -973,21 +976,21 @@ GREPTEST2()
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actual_err
|
||||
rm -f $actual $actual_err
|
||||
fi
|
||||
}
|
||||
|
||||
# Print a "SKIP" message
|
||||
SKIP() {
|
||||
TESTING $DUMPER $@
|
||||
TESTING $DUMPER $@
|
||||
echo " -SKIP-"
|
||||
}
|
||||
|
||||
# Print a line-line message left justified in a field of 70 characters
|
||||
#
|
||||
PRINT_H5DIFF() {
|
||||
SPACES=" "
|
||||
echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
SPACES=" "
|
||||
echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
}
|
||||
|
||||
|
||||
@ -997,10 +1000,11 @@ DIFFTEST()
|
||||
{
|
||||
PRINT_H5DIFF $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5DIFF_BIN "$@" -q
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5DIFF_BIN "$@" -q
|
||||
)
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ] ; then
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
@ -1014,8 +1018,8 @@ DIFFTEST()
|
||||
# beginning with the word "Verifying".
|
||||
#
|
||||
PRINT_H5IMPORT() {
|
||||
SPACES=" "
|
||||
echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
SPACES=" "
|
||||
echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
}
|
||||
|
||||
# Call the h5import tool
|
||||
@ -1025,15 +1029,16 @@ IMPORTTEST()
|
||||
# remove the output hdf5 file if it exists
|
||||
hdf5_file="$TESTDIR/$5"
|
||||
if [ -f $hdf5_file ]; then
|
||||
rm -f $hdf5_file
|
||||
rm -f $hdf5_file
|
||||
fi
|
||||
|
||||
PRINT_H5IMPORT $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5IMPORT_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5IMPORT_BIN "$@"
|
||||
)
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ] ; then
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
@ -1138,9 +1143,9 @@ TOOLTEST tcomp-4.ddl --enable-error-stack tcompound_complex.h5
|
||||
TOOLTEST tcompound_complex2.ddl --enable-error-stack tcompound_complex2.h5
|
||||
# tests for bitfields and opaque data types
|
||||
if test $WORDS_BIGENDIAN != "yes"; then
|
||||
TOOLTEST tbitnopaque_le.ddl --enable-error-stack tbitnopaque.h5
|
||||
TOOLTEST tbitnopaque_le.ddl --enable-error-stack tbitnopaque.h5
|
||||
else
|
||||
TOOLTEST tbitnopaque_be.ddl --enable-error-stack tbitnopaque.h5
|
||||
TOOLTEST tbitnopaque_be.ddl --enable-error-stack tbitnopaque.h5
|
||||
fi
|
||||
|
||||
#test for the nested compound type
|
||||
@ -1318,12 +1323,12 @@ TOOLTEST tallfilters.ddl --enable-error-stack -H -p -d all tfilters.h5
|
||||
TOOLTEST tuserfilter.ddl --enable-error-stack -H -p -d myfilter tfilters.h5
|
||||
|
||||
if test $USE_FILTER_DEFLATE = "yes" ; then
|
||||
# data read internal filters
|
||||
TOOLTEST treadintfilter.ddl --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5
|
||||
if test $USE_FILTER_SZIP = "yes"; then
|
||||
# data read
|
||||
TOOLTEST treadfilter.ddl --enable-error-stack -d all -d szip tfilters.h5
|
||||
fi
|
||||
# data read internal filters
|
||||
TOOLTEST treadintfilter.ddl --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5
|
||||
if test $USE_FILTER_SZIP = "yes"; then
|
||||
# data read
|
||||
TOOLTEST treadfilter.ddl --enable-error-stack -d all -d szip tfilters.h5
|
||||
fi
|
||||
fi
|
||||
|
||||
# test for displaying objects with very long names
|
||||
@ -1380,9 +1385,9 @@ TOOLTEST tbin4.ddl --enable-error-stack -d double -b FILE -o out4.bin tbin
|
||||
|
||||
# Clean up binary output files
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f out[1-4].bin
|
||||
rm -f out1.h5
|
||||
rm -f out3.h5
|
||||
rm -f out[1-4].bin
|
||||
rm -f out1.h5
|
||||
rm -f out3.h5
|
||||
fi
|
||||
|
||||
# test for dataset region references
|
||||
@ -1394,7 +1399,7 @@ TOOLTEST2 tbinregR.exp --enable-error-stack -d /Dataset1 -s 0 -R -y -o tbinregR.
|
||||
|
||||
# Clean up text output files
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f tbinregR.txt
|
||||
rm -f tbinregR.txt
|
||||
fi
|
||||
|
||||
# tests for group creation order
|
||||
|
||||
@ -236,26 +236,25 @@ TOOLTEST() {
|
||||
cp $actual_err $actual_err_sav
|
||||
STDERR_FILTER $actual_err
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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 $actual_ext
|
||||
rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -274,36 +273,36 @@ TOOLTEST2() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expectdata $actualdata; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
elif $CMP $expect $actual; then
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expectdata $actualdata; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
# Clean up output file
|
||||
@ -328,8 +327,8 @@ TOOLTEST3() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -348,23 +347,23 @@ TOOLTEST3() {
|
||||
$actual_err > $actual_ext
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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
|
||||
|
||||
}
|
||||
@ -385,8 +384,8 @@ TOOLTEST4() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -405,30 +404,30 @@ TOOLTEST4() {
|
||||
$actual_err > $actual_ext
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
if $CMP $expect_err $actual_ext; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.err) differs from actual result (*.oerr)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/ /'
|
||||
fi
|
||||
if $CMP $expect_err $actual_ext; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.err) differs from actual result (*.oerr)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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
|
||||
|
||||
}
|
||||
@ -442,8 +441,8 @@ SKIP() {
|
||||
# Print a line-line message left justified in a field of 70 characters
|
||||
#
|
||||
PRINT_H5DIFF() {
|
||||
SPACES=" "
|
||||
echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
SPACES=" "
|
||||
echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
}
|
||||
|
||||
|
||||
@ -453,10 +452,11 @@ DIFFTEST()
|
||||
{
|
||||
PRINT_H5DIFF $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5DIFF_BIN "$@" -q
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5DIFF_BIN "$@" -q
|
||||
)
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ] ; then
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
@ -470,8 +470,8 @@ DIFFTEST()
|
||||
# beginning with the word "Verifying".
|
||||
#
|
||||
PRINT_H5IMPORT() {
|
||||
SPACES=" "
|
||||
echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
SPACES=" "
|
||||
echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
}
|
||||
|
||||
# Call the h5import tool
|
||||
@ -481,22 +481,22 @@ IMPORTTEST()
|
||||
# remove the output hdf5 file if it exists
|
||||
hdf5_file="$TESTDIR/$5"
|
||||
if [ -f $hdf5_file ]; then
|
||||
rm -f $hdf5_file
|
||||
rm -f $hdf5_file
|
||||
fi
|
||||
|
||||
PRINT_H5IMPORT $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5IMPORT_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5IMPORT_BIN "$@"
|
||||
)
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ] ; then
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
else
|
||||
echo " PASSED"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -205,8 +205,8 @@ TOOLTEST() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -216,26 +216,25 @@ TOOLTEST() {
|
||||
STDERR_FILTER $actual_err
|
||||
cat $actual_err >> $actual
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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 $actual_ext
|
||||
rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -254,42 +253,42 @@ TOOLTEST2() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
cat $actual_err >> $actual
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expectdata $actualdata; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
elif $CMP $expect $actual; then
|
||||
if [ ! -f $expectdata ]; then
|
||||
# Create the expect data file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actualdata $expectdata
|
||||
echo " Expected data (*.exp) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expectdata $actualdata; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected datafile (*.exp) differs from actual datafile (*.txt)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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 $actualdata $actual_err
|
||||
rm -f $actual $actualdata $actual_err
|
||||
fi
|
||||
|
||||
}
|
||||
@ -309,8 +308,8 @@ TOOLTEST3() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -326,27 +325,27 @@ TOOLTEST3() {
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
-e 's/H5Eget_auto[1-2]*/H5Eget_auto(1 or 2)/' \
|
||||
-e 's/H5Eset_auto[1-2]*/H5Eset_auto(1 or 2)/' \
|
||||
$actual_err > $actual_ext
|
||||
$actual_err > $actual_ext
|
||||
cat $actual_ext >> $actual
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ddl) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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
|
||||
|
||||
}
|
||||
@ -367,8 +366,8 @@ TOOLTEST4() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
@ -384,47 +383,46 @@ TOOLTEST4() {
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
-e 's/H5Eget_auto[1-2]*/H5Eget_auto(1 or 2)/' \
|
||||
-e 's/H5Eset_auto[1-2]*/H5Eset_auto(1 or 2)/' \
|
||||
$actual_err > $actual_ext
|
||||
$actual_err > $actual_ext
|
||||
#cat $actual_ext >> $actual
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
elif $CMP $expect $actual; then
|
||||
if $CMP $expect_err $actual_ext; then
|
||||
echo " PASSED"
|
||||
if $CMP $expect_err $actual_ext; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.err) differs from actual result (*.oerr)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.err) differs from actual result (*.oerr)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/ /'
|
||||
fi
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ddl) differs from actual result (*.out)"
|
||||
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
|
||||
|
||||
}
|
||||
|
||||
# Print a "SKIP" message
|
||||
SKIP() {
|
||||
TESTING $DUMPER $@
|
||||
TESTING $DUMPER $@
|
||||
echo " -SKIP-"
|
||||
}
|
||||
|
||||
# Print a line-line message left justified in a field of 70 characters
|
||||
#
|
||||
PRINT_H5DIFF() {
|
||||
SPACES=" "
|
||||
echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
SPACES=" "
|
||||
echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
}
|
||||
|
||||
|
||||
@ -434,25 +432,25 @@ DIFFTEST()
|
||||
{
|
||||
PRINT_H5DIFF $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5DIFF_BIN "$@" -q
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5DIFF_BIN "$@" -q
|
||||
)
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ] ; then
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
else
|
||||
echo " PASSED"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
# Print a line-line message left justified in a field of 70 characters
|
||||
# beginning with the word "Verifying".
|
||||
#
|
||||
PRINT_H5IMPORT() {
|
||||
SPACES=" "
|
||||
echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
SPACES=" "
|
||||
echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
}
|
||||
|
||||
# Call the h5import tool
|
||||
@ -462,22 +460,22 @@ IMPORTTEST()
|
||||
# remove the output hdf5 file if it exists
|
||||
hdf5_file="$TESTDIR/$5"
|
||||
if [ -f $hdf5_file ]; then
|
||||
rm -f $hdf5_file
|
||||
rm -f $hdf5_file
|
||||
fi
|
||||
|
||||
PRINT_H5IMPORT $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5IMPORT_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5IMPORT_BIN "$@"
|
||||
)
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ] ; then
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
else
|
||||
echo " PASSED"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -491,7 +489,7 @@ COPY_TESTFILES_TO_TESTDIR
|
||||
|
||||
####### test for dataset vds ######
|
||||
|
||||
# Data read
|
||||
# Data read
|
||||
if test $USE_FILTER_DEFLATE = "yes" ; then
|
||||
TOOLTEST tvds-1.ddl --enable-error-stack 1_vds.h5
|
||||
TOOLTEST tvds-2.ddl --enable-error-stack 2_vds.h5
|
||||
@ -504,7 +502,7 @@ if test $USE_FILTER_DEFLATE = "yes" ; then
|
||||
TOOLTEST vds-gap2.ddl --vds-gap-size=2 --enable-error-stack vds-eiger.h5
|
||||
fi
|
||||
|
||||
# Layout read
|
||||
# Layout read
|
||||
if test $USE_FILTER_DEFLATE = "yes" ; then
|
||||
TOOLTEST tvds_layout-1.ddl -p --enable-error-stack 1_vds.h5
|
||||
TOOLTEST tvds_layout-2.ddl -p --enable-error-stack 2_vds.h5
|
||||
|
||||
@ -262,36 +262,35 @@ TOOLTEST() {
|
||||
# Run test.
|
||||
TESTING $DUMPER $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $DUMPER_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.xml) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.xml) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.xml) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.xml) differs from actual result (*.out)"
|
||||
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
|
||||
rm -f $actual $actual_err
|
||||
fi
|
||||
}
|
||||
|
||||
# Print a "SKIP" message
|
||||
SKIP() {
|
||||
TESTING $DUMPER $@
|
||||
echo " -SKIP-"
|
||||
TESTING $DUMPER $@
|
||||
echo " -SKIP-"
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -139,8 +139,8 @@ CLEAN_TESTFILES_AND_TESTDIR()
|
||||
# Print a $* message left justified in a field of 70 characters
|
||||
#
|
||||
MESSAGE() {
|
||||
SPACES=" "
|
||||
echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
SPACES=" "
|
||||
echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
|
||||
}
|
||||
|
||||
# Print a line-line message left justified in a field of 70 characters
|
||||
@ -206,7 +206,7 @@ TOOLTEST() {
|
||||
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
|
||||
echo " Expected result (*.ls) missing"
|
||||
|
||||
@ -150,10 +150,11 @@ TOOLTEST()
|
||||
{
|
||||
TESTING $H5MKGRP $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5MKGRP_BIN $@
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5MKGRP_BIN $@
|
||||
) > output.out
|
||||
RET=$?
|
||||
|
||||
if [ $RET != 0 ]; then
|
||||
echo "*FAILED*"
|
||||
echo "failed result is:"
|
||||
@ -164,7 +165,7 @@ TOOLTEST()
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f output.out
|
||||
rm -f output.out
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -181,8 +182,8 @@ H5LSTEST()
|
||||
# any unexpected output from that stream too.
|
||||
VERIFY_H5LS $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5LS_BIN $H5LS_ARGS $@
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5LS_BIN $H5LS_ARGS $@
|
||||
) 2>&1 |sed 's/Modified:.*/Modified: XXXX-XX-XX XX:XX:XX XXX/' >$actual
|
||||
|
||||
# save actual in case it is needed later.
|
||||
@ -190,25 +191,25 @@ H5LSTEST()
|
||||
STDOUT_FILTER $actual
|
||||
STDERR_FILTER $actual
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ls) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ls) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
fi
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.ls) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.ls) differs from actual result (*.out)"
|
||||
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_sav
|
||||
fi
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actual_sav
|
||||
fi
|
||||
}
|
||||
|
||||
# Single run of tool
|
||||
@ -258,30 +259,30 @@ CMPTEST()
|
||||
# any unexpected output from that stream too.
|
||||
TESTING $H5MKGRP $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5MKGRP_BIN $@
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5MKGRP_BIN $@
|
||||
) >$actual 2>$actual_err
|
||||
cat $actual_err >> $actual
|
||||
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.txt) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.txt) differs from actual result (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
fi
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.txt) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
echo " Expected result (*.txt) differs from actual result (*.out)"
|
||||
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
|
||||
fi
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actual_err
|
||||
fi
|
||||
}
|
||||
|
||||
##############################################################################
|
||||
|
||||
Loading…
Reference in New Issue
Block a user