mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-09 08:11:38 +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*.
58 lines
1.5 KiB
Bash
Executable File
58 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. "$srcdir/test_nczarr.sh"
|
|
|
|
set -e
|
|
|
|
s3isolate "testdir_nulls"
|
|
THISDIR=`pwd`
|
|
cd $ISOPATH
|
|
|
|
# This shell script tests support for special cases of NC_CHAR
|
|
|
|
testcase() {
|
|
zext=$1
|
|
|
|
echo "*** Test: nczarr string write then read; format=$zext"
|
|
# Get pure zarr args
|
|
fileargs tmp_nulls_zarr "mode=zarr,$zext"
|
|
zarrurl="$fileurl"
|
|
zarrfile="$file"
|
|
# Get nczarr args
|
|
fileargs tmp_nulls_nczarr "mode=nczarr,$zext"
|
|
nczarrurl="$fileurl"
|
|
nczarrfile="$file"
|
|
|
|
# setup
|
|
deletemap $zext $zarrfile
|
|
deletemap $zext $nczarrfile
|
|
|
|
# Create alternate ref files
|
|
echo "*** create pure zarr file"
|
|
${NCGEN} -4 -b -o "$zarrurl" $srcdir/ref_nulls.cdl
|
|
echo "*** create nczarr file"
|
|
${NCGEN} -4 -b -o "$nczarrurl" $srcdir/ref_nulls.cdl
|
|
|
|
echo "*** read purezarr"
|
|
${NCDUMP} -n ref_nulls $zarrurl > tmp_nulls_zarr_${zext}.cdl
|
|
${ZMD} -h $zarrurl > tmp_nulls_zarr_${zext}.txt
|
|
echo "*** read nczarr"
|
|
${NCDUMP} -n ref_nulls $nczarrurl > tmp_nulls_nczarr_${zext}.cdl
|
|
${ZMD} -h $nczarrurl > tmp_nulls_nczarr_${zext}.txt
|
|
|
|
echo "*** verify zarr output"
|
|
diff -bw ${srcdir}/ref_nulls_zarr.baseline tmp_nulls_zarr_${zext}.cdl
|
|
|
|
echo "*** verify nczarr output"
|
|
diff -bw ${srcdir}/ref_nulls_nczarr.baseline tmp_nulls_nczarr_${zext}.cdl
|
|
}
|
|
|
|
testcase file
|
|
if test "x$FEATURE_NCZARR_ZIP" = xyes ; then testcase zip; fi
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then testcase s3; fi
|
|
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then s3sdkdelete "/${S3ISOPATH}" ; fi # Cleanup
|