mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-03-13 17:18:08 +08:00
2ea1cf5f1b
stored in the _NCProperties attribute to allow two things:
1. capture of additional library dependencies (over and above
hdf5)
2. Recognition of non-netcdf libraries that create netcdf-4 format
files.
To this end, the _NCProperties format has been extended to be
and arbitrary set of key=value pairs separated by commas.
This new format has version = 2, and uses commas as the pair separator.
Thus the general form is:
_NCProperties = "version=2,key1=value,key2=value2..." ;
This new version is accompanied by a new ./configure option of the form
--with-ncproperties="key1=value1,key2=value2..."
that specifies pairs to add to the _NCProperties attribute for all
files created with that netcdf library.
At this point, what is missing is some programmatic way to
specify either all the pairs or additional pairs
to the _NCProperties attribute. Not sure of the best way
to do this.
Builders using non-netcdf libraries can specify
whatever they want in the key value pairs (as long
as the version=2 is specified first).
By convention, the primary library is expected to be the
the first pair after the leading version=2 pair, but this
is convention only and is neither required nor enforced.
Related changes:
1. Fixed the tests that check _NCProperties to properly operate with version=2.
2. When reading a version 1 _NCProperties attribute, convert it to look
like a version 2 attribute.
2. Added some version 2 tests to ncdump/tst_fileinfo.c and
ncdump/tst_fileinfo.sh
Misc Changes:
1. Fix minor problem in ncdap_test/testurl.sh where a parameter to
buildurl needed to be quoted.
2. Minor fix to ncgen to swap switches -H and -h to be consistent
with other utilities.
3. Document the -M flag in nccopy usage() and the nccopy man page.
4. Modify a test case to use the nccopy -M flag.
109 lines
2.2 KiB
Bash
Executable File
109 lines
2.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
#NOP=1
|
|
#NOS=1
|
|
#NOB=1
|
|
|
|
#SHOW=1
|
|
#DBG=1
|
|
#GDB=1
|
|
|
|
# if this is part of a distcheck action, then this script
|
|
# will be executed in a different directory
|
|
# than the one containing it; so capture the path to this script
|
|
# as the location of the source directory.
|
|
|
|
# capture the build directory
|
|
# Do a hack to remove e.g. c: for CYGWIN
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
OCLOGFILE=stderr
|
|
if test "x$DBG" = x1 ; then
|
|
SHOW=1
|
|
fi
|
|
|
|
URL="http://remotetest.unidata.ucar.edu/dts/test.03"
|
|
|
|
PREFIX="[log][show=fetch]"
|
|
SUFFIX="log&show=fetch"
|
|
BOTHP="[log][show=fetch]"
|
|
BOTHS="noprefetch&fetch=disk"
|
|
STRLEN="[maxstrlen=16]"
|
|
|
|
locreset () {
|
|
rm -f ./tmp_testurl ./errtmp_testurl
|
|
}
|
|
|
|
buildurl () {
|
|
front="$1"
|
|
back="$2"
|
|
url="${front}${URL}"
|
|
if test "x$back" != x ; then
|
|
url="${url}#${back}"
|
|
fi
|
|
}
|
|
|
|
pass=1
|
|
|
|
if test "x$GDB" = x1 ; then
|
|
NCDUMP="gdb --args $NCDUMP"
|
|
fi
|
|
|
|
# Initialize
|
|
locreset
|
|
|
|
if test "x$NOP" != x1 ; then
|
|
echo "***Testing url prefix parameters"
|
|
buildurl "$PREFIX" ""
|
|
# Invoke ncdump to extract the URL
|
|
|
|
echo "command: ${NCDUMP} -h $url"
|
|
|
|
${NCDUMP} -h "$url" >./tmp_testurl 2> ./errtmp_testurl
|
|
if test "x${SHOW}" = x1 ; then cat ./tmp ; fi
|
|
|
|
# Test that maxstrlen works as alias for stringlength
|
|
echo "***Testing maxstrlen=stringlength alias"
|
|
buildurl "$STRLEN" ""
|
|
# Invoke ncdump to extract the URL
|
|
echo "command: ${NCDUMP} -h $url"
|
|
${NCDUMP} "$url" >./tmp_testurl 2> ./errtmp_testurl
|
|
if test "x${SHOW}" = x1 ; then cat ./tmp_testurl ; fi
|
|
# Look for the value of maxStrlen in output cdl
|
|
if ! fgrep -i "maxstrlen = 16" ./tmp_testurl ; then
|
|
echo "***Fail: maxStrlen not recognized"
|
|
fgrep -i "maxstrlen16 = 16" ./tmp_testurl > ./errtmp_testurl
|
|
fi
|
|
|
|
fi
|
|
|
|
locreset
|
|
if test "x$NOS" != x1 ; then
|
|
echo "***Testing url suffix parameters"
|
|
buildurl "" "$SUFFIX"
|
|
# Invoke ncdump to extract the URL
|
|
${NCDUMP} -h "$url" >./tmp_testurl 2> ./errtmp_testurl
|
|
if test "x${SHOW}" = x1 ; then cat ./tmp_testurl ; fi
|
|
fi
|
|
|
|
locreset
|
|
|
|
if test "x$NOB" != x1 ; then
|
|
echo "***Testing url prefix+suffix parameters"
|
|
buildurl "$BOTHP" "$BOTHS"
|
|
# Invoke ncdump to extract the URL
|
|
${NCDUMP} -h "$url" >./tmp_testurl 2> ./errtmp_testurl
|
|
if test "x${SHOW}" = x1 ; then cat ./tmp_testurl ; fi
|
|
fi
|
|
|
|
locreset
|
|
|
|
if test "x$pass" = x0 ; then
|
|
echo "***FAIL"
|
|
exit 1
|
|
fi
|
|
echo "***PASS"
|
|
exit 0
|