netcdf-c/ncdump/tst_ncgen4_diff.sh

73 lines
1.9 KiB
Bash
Raw Normal View History

2010-06-03 21:24:43 +08:00
#!/bin/sh
2015-11-20 04:44:07 +08:00
Primary change: add dap4 support 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
2017-03-09 08:01:10 +08:00
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh
2010-06-03 21:24:43 +08:00
. ${srcdir}/tst_ncgen_shared.sh
2010-06-03 21:24:43 +08:00
ALLXFAIL="${XFAILTESTS} ${SPECIALTESTS}"
if test "${MODE}" = 3 ; then
if test "${KFLAG}" = 4 ; then
TESTSET="${TESTS3} ${SPECIALTESTS3}"
else
TESTSET="${TESTS3}"
fi
else
TESTSET="${TESTS3} ${TESTS4} ${ALLXFAIL}"
fi
echo "*** Testing ncgen with -k${KFLAG}"
mkdir ${RESULTSDIR}
2010-06-03 21:24:43 +08:00
cd ${RESULTSDIR}
for x in ${TESTSET} ; do
2015-11-20 04:44:07 +08:00
if test $verbose = 1 ; then echo "*** Testing: ${x}" ; fi
2010-06-03 21:24:43 +08:00
# determine if we need the specflag set
specflag=
headflag=
for s in ${SPECIALTESTS} ; do
if test "x${s}" = "x${x}" ; then specflag="-s"; headflag="-h"; fi
done
# determine if this is an xfailtest
isxfail=
for t in ${ALLXFAIL} ; do
if test "x${t}" = "x${x}" ; then isxfail=1; fi
done
rm -f ${x}.nc ${x}.dmp
${NCGEN} -b -k${KFLAG} -o ${x}_$$.nc ${cdl}/${x}.cdl
2010-06-03 21:24:43 +08:00
# dump .nc file
# if windows, we need to remove any leading 0's in exponents.
${NCDUMP} ${headflag} ${specflag} -n ${x} ${x}_$$.nc | sed 's/e+0/e+/g' > ${x}.dmp
2010-06-03 21:24:43 +08:00
# compare the expected (silently if XFAIL)
if test "x$isxfail" = "x1" -a "x$SHOWXFAILS" = "x" ; then
Improve S3 Documentation and Support ## Improvements to S3 Documentation * Create a new document *quickstart_paths.md* that give a summary of the legal path formats used by netcdf-c. This includes both file paths and URL paths. * Modify *nczarr.md* to remove most of the S3 related text. * Move the S3 text from *nczarr.md* to a new document *cloud.md*. * Add some S3-related text to the *byterange.md* document. Hopefully, this will make it easier for users to find the information they want. ## Rebuild NCZarr Testing In order to avoid problems with running make check in parallel, two changes were made: 1. The *nczarr_test* test system was rebuilt. Now, for each test. any generated files are kept in a test-specific directory, isolated from all other test executions. 2. Similarly, since the S3 test bucket is shared, any generated S3 objects are isolated using a test-specific key path. ## Other S3 Related Changes * Add code to ensure that files created on S3 are reclaimed at end of testing. * Used the bash "trap" command to ensure S3 cleanup even if the test fails. * Cleanup the S3 related configure.ac flag set since S3 is used in several places. So now one should use the option *--enable-s3* instead of *--enable-nczarr-s3*, although the latter is still kept as a deprecated alias for the former. * Get some of the github actions yml to work with S3; required fixing various test scripts adding a secret to access the Unidata S3 bucket. * Cleanup S3 portion of libnetcdf.settings.in and netcdf_meta.h.in and test_common.in. * Merge partial S3 support into dhttp.c. * Create an experimental s3 access library especially for use with Windows. It is enabled by using the options *--enable-s3-internal* (automake) or *-DENABLE_S3_INTERNAL=ON* (CMake). Also add a unit-test for it. * Move some definitions from ncrc.h to ncs3sdk.h ## Other Changes * Provide a default implementation of strlcpy and move this and similar defaults into *dmissing.c*.
2023-04-26 07:15:06 +08:00
if diff -b -bw ${expected}/${x}.dmp ${x}.dmp &>/dev/null ; then ok=1; else ok=0; fi
2010-06-03 21:24:43 +08:00
else
if diff -b -w ${expected}/${x}.dmp ${x}.dmp ; then ok=1; else ok=0; fi
2010-06-03 21:24:43 +08:00
fi
if test "x$ok" = "x1" ; then
test $verbose = 1 && echo "*** SUCCEED: ${x}"
passcount=`expr $passcount + 1`
elif test "x${isxfail}" = "x1" ; then
echo "*** XFAIL : ${x}"
2010-06-03 21:24:43 +08:00
xfailcount=`expr $xfailcount + 1`
else
echo "*** FAIL: ${x}"
failcount=`expr $failcount + 1`
fi
done
cd ..
totalcount=`expr $passcount + $failcount + $xfailcount`
okcount=`expr $passcount + $xfailcount`
2015-11-20 04:44:07 +08:00
2010-06-03 21:24:43 +08:00
echo "*** PASSED: ${okcount}/${totalcount} ; ${xfailcount} expected failures ; ${failcount} unexpected failures"
rm -rf ${RESULTSDIR}
2010-06-03 21:24:43 +08:00
if test $failcount -gt 0 ; then
exit 1
else
exit 0
fi