fix test cases

This commit is contained in:
Dennis Heimbigner 2021-01-07 19:37:03 -07:00
parent 016fd578b3
commit a27283e0e6
2 changed files with 15 additions and 12 deletions

View File

@ -3,9 +3,10 @@
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh
set -e
. ${srcdir}/d4test_common.sh
set -e
echo "test_fillmismatch.sh:"
F="test_fillmismatch.nc"
@ -13,17 +14,17 @@ F="test_fillmismatch.nc"
URL='[dap4]file://'
URL="${URL}${srcdir}/misctestfiles/$F"
# First check that without [fillmismatch], we get a failure
# First check that with [nofillmismatch], we get a failure
rm -f ./tmp_dap4_mismatch
if ${NCDUMP} -h "${URL}" > ./tmp_dap4_mismatch 2>&1 ; then
echo "*** Fail: ${NCDUMP} ${URL} passed"
URLNO="[nofillmismatch]$URL"
if ${NCDUMP} -h "${NOURL}" > ./tmp_dap4_mismatch 2>&1 ; then
echo "*** Fail: ${NCDUMP} ${NOURL} passed"
exit 1
else
echo "*** XFail: ${NCDUMP} ${URL} failed"
echo "*** XFail: ${NCDUMP} ${NOURL} failed"
fi
# Now check that with [fillmismatch], we get success
URL="[fillmismatch]${URL}"
# Now check that with [fillmismatch] (default), we get success
rm -f ./tmp_dap4_mismatch
if ${NCDUMP} -h "${URL}" > ./tmp_dap4_mismatch ; then
echo "*** Pass: ${NCDUMP} ${URL} passed"
@ -36,4 +37,3 @@ fi
diff -w ${srcdir}/baselineraw/$F.dmp ./tmp_dap4_mismatch
#cleanup
rm -f ./tmp_dap4_mismatch
exit

View File

@ -5,6 +5,8 @@
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh
set -e
F="fillmismatch.nc"
EXPECTED="${srcdir}/expected3"
@ -13,11 +15,12 @@ URL="${URL}${srcdir}/testdata3/$F"
# First check that with [nofillmismatch], we get a failure
rm -f ./tmp_tst_mismatch
if ${NCDUMP} "[nofillmismatch]${URL}" > ./tmp_tst_mismatch 2>&1 ; then
echo "*** Fail: ${NCDUMP} ${URL} passed"
NOURL="[nofillmismatch]$URL"
if ${NCDUMP} "${NOURL}" > ./tmp_tst_mismatch 2>&1 ; then
echo "*** Fail: ${NCDUMP} ${NOURL} passed"
exit 1
else
echo "*** XFail: ${NCDUMP} ${URL} failed"
echo "*** XFail: ${NCDUMP} ${NOURL} failed"
fi
# Now check that with [fillmismatch] (default), we get success
@ -33,4 +36,4 @@ fi
diff -w ${EXPECTED}/$F.dmp ./tmp_tst_mismatch
#cleanup
rm -f ./tmp_tst_mismatch
exit