Merge branch '4.8.0-wellspring.wif' of github.com:Unidata/netcdf-c into 4.8.0-wellspring.wif

This commit is contained in:
Ward Fisher 2021-03-09 13:40:23 -07:00
commit ec069646b8

View File

@ -3,6 +3,8 @@
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh
set -e
# Which test cases to exercise
API=1
NG=1
@ -209,13 +211,13 @@ if ! test -f unfiltered.nc ; then
fi
${NCCOPY} "-F/g/var,307,4|40000" unfiltered.nc nccopyF.nc
${NCDUMP} -hs nccopyF.nc > ./nccopyF.cdl
sclean nccopyF.cdl nccopyFs.cdl
sclean nccopyF.cdl nccopyFs.cdl
diff -b -w ${srcdir}/ref_nccopyF.cdl ./nccopyFs.cdl
echo "*** ncgen with multiple filters"
${NCGEN} -4 -lb -o ncgenF.nc ${srcdir}/ref_nccopyF.cdl
# Need to fix name using -n
${NCDUMP} -hs -n nccopyF ncgenF.nc > ./ncgenF.cdl
sclean ncgenF.cdl ncgenFs.cdl
sclean ncgenF.cdl ncgenFs.cdl
diff -b -w ${srcdir}/ref_nccopyF.cdl ./ncgenFs.cdl
echo "*** Pass: multiple filters"
fi
@ -244,19 +246,18 @@ fi
echo "*** Pass: all selected tests passed"
#cleanup
rm -f testmisc.nc
rm -f unfiltered.nc unfilteredvv.nc filtered.nc filtered.dump
rm -f filteredvv.nc tst_filtervv.txt filteredvv.dump
rm -f filteredvbar.nc tst_filtervbar.txt filteredvbar.dump
rm -f tst_filter2.nc tst_filter2.txt
rm -f tst_none.nc tst_none.txt tst_none2.txt testfilter_reg.nc
rm -f tst_vnone.nc tst_vnone.txt tst_vnone2.txt
rm -f bzip2.nc bzip2.dump tst_filter.txt bzip2x.dump
rm -f test_bzip2.c
rm -f multifilter.nc multi.cdl smulti.cdl
rm -f nccopyF.nc nccopyF.cdl ncgenF.nc ncgenF.cdl
rm -f ncgenFs.cdl nccopyFs.cdl
#rm -f testmisc.nc
#rm -f unfiltered.nc unfilteredvv.nc filtered.nc filtered.dump
#rm -f filteredvv.nc tst_filtervv.txt filteredvv.dump
#rm -f filteredvbar.nc tst_filtervbar.txt filteredvbar.dump
#rm -f tst_filter2.nc tst_filter2.txt
#rm -f tst_none.nc tst_none.txt tst_none2.txt testfilter_reg.nc
#rm -f tst_vnone.nc tst_vnone.txt tst_vnone2.txt
#rm -f bzip2.nc bzip2.dump tst_filter.txt bzip2x.dump
#rm -f test_bzip2.c
#rm -f multifilter.nc multi.cdl smulti.cdl
#rm -f nccopyF.nc nccopyF.cdl ncgenF.nc ncgenF.cdl
#rm -f ncgenFs.cdl nccopyFs.cdl
#rm -f crfilterorder.txt rdfilterorder.txt
exit 0