mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-27 07:30:33 +08:00
3db4f013bf
Specific changes:
1. Add dap4 code: libdap4 and dap4_test.
Note that until the d4ts server problem is solved, dap4 is turned off.
2. Modify various files to support dap4 flags:
configure.ac, Makefile.am, CMakeLists.txt, etc.
3. Add nc_test/test_common.sh. This centralizes
the handling of the locations of various
things in the build tree: e.g. where is
ncgen.exe located. See nc_test/test_common.sh
for details.
4. Modify .sh files to use test_common.sh
5. Obsolete separate oc2 by moving it to be part of
netcdf-c. This means replacing code with netcdf-c
equivalents.
5. Add --with-testserver to configure.ac to allow
override of the servers to be used for --enable-dap-remote-tests.
6. There were multiple versions of nctypealignment code. Try to
centralize in libdispatch/doffset.c and include/ncoffsets.h
7. Add a unit test for the ncuri code because of its complexity.
8. Move the findserver code out of libdispatch and into
a separate, self contained program in ncdap_test and dap4_test.
9. Move the dispatch header files (nc{3,4}dispatch.h) to
.../include because they are now shared by modules.
10. Revamp the handling of TOPSRCDIR and TOPBUILDDIR for shell scripts.
11. Make use of MREMAP if available
12. Misc. minor changes e.g.
- #include <config.h> -> #include "config.h"
- Add some no-install headers to /include
- extern -> EXTERNL and vice versa as needed
- misc header cleanup
- clean up checking for misc. unix vs microsoft functions
13. Change copyright decls in some files to point to LICENSE file.
14. Add notes to RELEASENOTES.md
104 lines
3.9 KiB
Bash
Executable File
104 lines
3.9 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
# This shell script runs extra tests ncdump for netcdf-4
|
|
|
|
set -e
|
|
|
|
echo ""
|
|
echo "*** Running extra netcdf-4 tests."
|
|
|
|
#
|
|
# In windows, these tests fail because srcdir is prepended.
|
|
# e.g., Instead of 'ncdump ref_tst_compounds2' the file would
|
|
# contain:
|
|
# 'ncdump ./ref_tst_compounds2'. This causes the test to fail.
|
|
# But, 'srcdir' is necessary for make distcheck.
|
|
#
|
|
# Short term solution, use sed when on windows/MSYS to
|
|
# remove the './','../../ncdump'.
|
|
#
|
|
|
|
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then # MINGW Platforms
|
|
|
|
echo "*** dumping tst_string_data.nc to tst_string_data.cdl..."
|
|
|
|
${NCDUMP} tst_string_data.nc > tst_string_data.cdl
|
|
TMPNAME=`head -n 1 tst_string_data.cdl | cut -d" " -f 2`
|
|
NEWNAME=`basename $TMPNAME`
|
|
sed "s,$TMPNAME,$NEWNAME,g" tst_string_data.cdl > tmp.cdl
|
|
mv tmp.cdl tst_string_data.cdl
|
|
echo "*** comparing tst_string_data.cdl with ref_tst_string_data.cdl..."
|
|
diff -b tst_string_data.cdl $srcdir/ref_tst_string_data.cdl
|
|
|
|
echo '*** testing reference file ref_tst_compounds2.nc...'
|
|
${NCDUMP} $srcdir/ref_tst_compounds2.nc > tst_compounds2.cdl
|
|
TMPNAME=`head -n 1 tst_compounds2.cdl | cut -d" " -f 2`
|
|
NEWNAME=`basename $TMPNAME`
|
|
sed "s,$TMPNAME,$NEWNAME,g" tst_compounds2.cdl > tmp.cdl
|
|
mv tmp.cdl tst_compounds2.cdl
|
|
diff -b tst_compounds2.cdl $srcdir/ref_tst_compounds2.cdl
|
|
|
|
echo '*** testing reference file ref_tst_compounds3.nc...'
|
|
${NCDUMP} $srcdir/ref_tst_compounds3.nc > tst_compounds3.cdl
|
|
TMPNAME=`head -n 1 tst_compounds3.cdl | cut -d" " -f 2`
|
|
NEWNAME=`basename $TMPNAME`
|
|
sed "s,$TMPNAME,$NEWNAME,g" tst_compounds3.cdl > tmp.cdl
|
|
mv tmp.cdl tst_compounds3.cdl
|
|
diff -b tst_compounds3.cdl $srcdir/ref_tst_compounds3.cdl
|
|
|
|
echo '*** testing reference file ref_tst_compounds4.nc...'
|
|
${NCDUMP} $srcdir/ref_tst_compounds4.nc > tst_compounds4.cdl
|
|
TMPNAME=`head -n 1 tst_compounds4.cdl | cut -d" " -f 2`
|
|
NEWNAME=`basename $TMPNAME`
|
|
sed "s,$TMPNAME,$NEWNAME,g" tst_compounds4.cdl > tmp.cdl
|
|
mv tmp.cdl tst_compounds4.cdl
|
|
diff -b tst_compounds4.cdl $srcdir/ref_tst_compounds4.cdl
|
|
|
|
else # Non-MINGW Platforms
|
|
|
|
echo "*** dumping tst_string_data.nc to tst_string_data.cdl..."
|
|
${NCDUMP} tst_string_data.nc > tst_string_data.cdl
|
|
echo "*** comparing tst_string_data.cdl with ref_tst_string_data.cdl..."
|
|
diff -b tst_string_data.cdl $srcdir/ref_tst_string_data.cdl
|
|
|
|
#echo '*** testing non-coordinate variable of same name as dimension...'
|
|
#${NCGEN} -v4 -b -o tst_noncoord.nc $srcdir/ref_tst_noncoord.cdl
|
|
|
|
echo '*** testing reference file ref_tst_compounds2.nc...'
|
|
${NCDUMP} $srcdir/ref_tst_compounds2.nc > tst_compounds2.cdl
|
|
diff -b tst_compounds2.cdl $srcdir/ref_tst_compounds2.cdl
|
|
|
|
echo '*** testing reference file ref_tst_compounds3.nc...'
|
|
${NCDUMP} $srcdir/ref_tst_compounds3.nc > tst_compounds3.cdl
|
|
diff -b tst_compounds3.cdl $srcdir/ref_tst_compounds3.cdl
|
|
|
|
echo '*** testing reference file ref_tst_compounds4.nc...'
|
|
${NCDUMP} $srcdir/ref_tst_compounds4.nc > tst_compounds4.cdl
|
|
diff -b tst_compounds4.cdl $srcdir/ref_tst_compounds4.cdl
|
|
|
|
# Exercise Jira NCF-213 bug fix
|
|
# rm -f tst_ncf213.cdl tst_ncf213.nc
|
|
${NCGEN} -b -o tst_ncf213.nc $srcdir/ref_tst_ncf213.cdl
|
|
${NCDUMP} -s -h tst_ncf213.nc \
|
|
| sed -e 's/netcdflibversion=.*[|]/netcdflibversion=0.0.0|/' \
|
|
| sed -e 's/hdf5libversion=.*"/hdf5libversion=0.0.0"/' \
|
|
| sed -e 's|_SuperblockVersion = [0-9]|_SuperblockVersion = 0|' \
|
|
| cat >tst_ncf213.cdl
|
|
# Now compare
|
|
ok=1;
|
|
if diff -b $srcdir/ref_tst_ncf213.cdl tst_ncf213.cdl ; then ok=1; else ok=0; fi
|
|
# cleanup
|
|
# rm -f tst_ncf213.cdl tst_ncf213.nc
|
|
if test $ok = 0 ; then
|
|
echo "*** FAIL: NCF-213 Bug Fix test"
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
echo "*** All ncgen and ncdump extra test output for netCDF-4 format passed!"
|
|
exit 0
|
|
|