mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-27 07:30:33 +08:00
8072d1f6bb
re: issue https://github.com/Unidata/netcdf-c/issues/1151 Modify DAP2 and DAP4 code to handle case when _FillValue type is not same as the parent variable type. Specifically: 1. Define a parameter [fillmismatch] to allow this mismatch; default is to disallow. 2. If allowed, forcibly change the type of the _FillValue to match the parent variable. 3. If allowed Convert the values to match new type 4. Generate a log message 5. if not allowed, then fail Implementing this required some changes to ncdap_test/dapcvt.c Also added test cases. Minor Unrelated Changes: 1. There were a number of warnings about e.g. assigning a const char* to a char*. Fix these 2. In nccopy.1, replace .NP with .IP "n" (re PR https://github.com/Unidata/netcdf-c/pull/1144) 3. fix minor error in ncdump/ocprint
90 lines
2.1 KiB
Bash
Executable File
90 lines
2.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. ${srcdir}/d4test_common.sh
|
|
|
|
cd ${DAPTESTFILES}
|
|
F=`ls -1 *.dap | sed -e 's/[.]dap//g' | tr '\r\n' ' '`
|
|
cd $WD
|
|
|
|
if test "x${RESET}" = x1 ; then rm -fr ${BASELINE}/*.d4d ; fi
|
|
for f in $F ; do
|
|
echo "testing: ${f}"
|
|
if ! ${VG} ${execdir}/test_data ${DAPTESTFILES}/${f} ./results/${f}.nc ; then
|
|
failure "${execdir}/test_data ${DAPTESTFILES}/${f} ./results/${f}.nc"
|
|
fi
|
|
${NCDUMP} ${DUMPFLAGS} ./results/${f}.nc > ./results/${f}.d4d
|
|
if test "x${TEST}" = x1 ; then
|
|
if ! diff -wBb ${BASELINE}/${f}.d4d ./results/${f}.d4d ; then
|
|
failure "diff -wBb ${BASELINE}/${f}.d4d ./results/${f}.d4d"
|
|
fi
|
|
elif test "x${RESET}" = x1 ; then
|
|
echo "${f}:"
|
|
cp ./results/${f}.d4d ${BASELINE}/${f}.d4d
|
|
fi
|
|
done
|
|
|
|
# Remove empty lines and trim lines in a cdl file
|
|
trim() {
|
|
if test $# != 2 ; then
|
|
echo "simplify: too few args"
|
|
else
|
|
rm -f $2
|
|
while read -r iline; do
|
|
oline=`echo $iline | sed -e 's/^[\t ]*\([^\t ]*\)[\t ]*$/\\1/'`
|
|
if test "x$oline" = x ; then continue ; fi
|
|
echo "$oline" >> $2
|
|
done < $1
|
|
fi
|
|
}
|
|
|
|
# Do cleanup on the baseline file
|
|
baseclean() {
|
|
if test $# != 2 ; then
|
|
echo "simplify: too few args"
|
|
else
|
|
rm -f $2
|
|
while read -r iline; do
|
|
oline=`echo $iline | tr "'" '"'`
|
|
echo "$oline" >> $2
|
|
done < $1
|
|
fi
|
|
}
|
|
|
|
# Do cleanup on the result file
|
|
resultclean() {
|
|
if test $# != 2 ; then
|
|
echo "simplify: too few args"
|
|
else
|
|
rm -f $2
|
|
while read -r iline; do
|
|
oline=`echo $iline | sed -e 's|^\(netcdf.*\)[.]nc\(.*\)$|\\1\\2|'`
|
|
echo "$oline" >> $2
|
|
done < $1
|
|
fi
|
|
}
|
|
|
|
if test "x${CDLDIFF}" = x1 ; then
|
|
for f in $F ; do
|
|
STEM=`echo $f | cut -d. -f 1`
|
|
if ! test -e ${CDLTESTFILES}/${STEM}.cdl ; then
|
|
echo "Not found: ${CDLTESTFILES}/${STEM}.cdl"
|
|
continue
|
|
fi
|
|
echo "diff -wBb ${CDLTESTFILES}/${STEM}.cdl ./results/${f}.d4d"
|
|
rm -f ./b1 ./b2 ./r1 ./r2
|
|
trim ${CDLTESTFILES}/${STEM}.cdl ./b1
|
|
trim ./results/${f}.d4d ./r1
|
|
baseclean b1 b2
|
|
resultclean r1 r2
|
|
if ! diff -wBb ./b2 ./r2 ; then
|
|
failure "${f}"
|
|
fi
|
|
done
|
|
fi
|
|
|
|
finish
|
|
|