mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-21 08:39:46 +08:00
49737888ca
## 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*.
100 lines
2.3 KiB
Bash
Executable File
100 lines
2.3 KiB
Bash
Executable File
#!/bin/sh
|
|
# Tests for ncgen4 using list of test cdl files from the cdl4
|
|
# directory, and comparing output to expected results in the expected4
|
|
# directory. Note that these tests are run for classic files in
|
|
# tst_ncgen4_classic.sh
|
|
# Dennis Heimbigner
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. "$srcdir/test_nczarr.sh"
|
|
|
|
# Isolate both test and S3
|
|
s3isolate "testdir_ncgen4"
|
|
THISDIR=`pwd`
|
|
cd $ISOPATH
|
|
|
|
set -e
|
|
|
|
# To add a new test,
|
|
# 1. put the .cdl file in the 'ncdump/cdl' directory
|
|
# 2. put the result of running ncgen then ncdump
|
|
# into the directory 'expected' as .dmp
|
|
# 3. Add the test to the end of the TESTS variable
|
|
# 4. Add the new files into ncdump/cdl/Makefile.am
|
|
# and ncdump/expected/Makefile.am
|
|
|
|
TESTS="\
|
|
dimscope \
|
|
tst_group_data \
|
|
tst_solar_1 \
|
|
tst_nul4 \
|
|
"
|
|
|
|
# These tests need to leave _FillValue
|
|
FVTESTS="tst_nans"
|
|
|
|
ALLTESTS="$TESTS $FVTESTS"
|
|
|
|
# Location constants
|
|
cdl="$srcdir/../ncdump/cdl"
|
|
expected="$srcdir/../ncdump/expected"
|
|
|
|
# Functions
|
|
|
|
# See if this is an FVTEST
|
|
testiffv() {
|
|
ok=0
|
|
for FV in $FVTESTS ; do
|
|
if test "x$FV" = "x$1" ; then ok=1; fi
|
|
done
|
|
}
|
|
|
|
# Remove fillvalue attribute since zarr generates it when hdf5 does not
|
|
fvclean() {
|
|
cat $1 \
|
|
| sed -e '/:_FillValue/d' \
|
|
| cat > $2
|
|
}
|
|
|
|
difftest() {
|
|
echo ""; echo "*** Test zext=$zext"
|
|
for t in ${ALLTESTS} ; do
|
|
echo "*** Testing: ${t}"
|
|
# determine if we need the specflag set
|
|
# determine properties
|
|
checkprops ${t}
|
|
ref="ref_${t}"
|
|
rm -fr ${t}.$zext
|
|
rm -f tmp_${t}.dmp
|
|
fileargs $t
|
|
${NCGEN} -4 -lb -o ${fileurl} ${cdl}/${ref}.cdl
|
|
${NCDUMP} ${headflag} ${specflag} -n ${ref} ${fileurl} > tmp_${t}.dmp
|
|
testiffv $t
|
|
if test "x$ok" = x0 ; then
|
|
fvclean tmp_${t}.dmp tmp_${t}.dmpx
|
|
else
|
|
cp tmp_${t}.dmp tmp_${t}.dmpx
|
|
fi
|
|
# compare against expected
|
|
diff -b -w ${expected}/${ref}.dmp ./tmp_${t}.dmpx
|
|
echo "*** SUCCEED: ${t}"
|
|
done
|
|
}
|
|
|
|
runtestset() {
|
|
extfor $1
|
|
echo "*** Testing nczarr X ncgen with zmap=${zext}"
|
|
difftest
|
|
echo "*** PASSED: zext=${zext}"
|
|
}
|
|
|
|
runtestset file
|
|
if test "x$FEATURE_NCZARR_ZIP" = xyes ; then runtestset zip; fi
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then runtestset s3; fi
|
|
|
|
echo "*** PASSED ***"
|
|
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then s3sdkdelete "/${S3ISOPATH}" ; fi # Cleanup
|