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*.
73 lines
2.0 KiB
Bash
Executable File
73 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. "$srcdir/test_nczarr.sh"
|
|
|
|
s3isolate "testdir_nczarr_fill"
|
|
THISDIR=`pwd`
|
|
cd $ISOPATH
|
|
|
|
set -e
|
|
|
|
echo "*** Test: Github issues #2063, #2062, #2059"
|
|
|
|
testcase2059() {
|
|
zext=$1
|
|
echo "*** Test: Github issue #2059"
|
|
fileargs tmp_groups_regular "mode=zarr,$zext"
|
|
deletemap $zext $file
|
|
${NCCOPY} ${srcdir}/ref_groups.h5 "$fileurl"
|
|
rm -f tmp_nczfill.cdl
|
|
${ZMD} -h "$fileurl"
|
|
${NCDUMP} -s -n tmp_groups_regular "$fileurl" > tmp_nczfill.cdl
|
|
sclean tmp_nczfill.cdl tmp_groups_regular_$zext.cdl
|
|
diff -wb ${srcdir}/ref_groups_regular.cdl tmp_groups_regular_$zext.cdl
|
|
}
|
|
|
|
testcase2062() {
|
|
zext=$1
|
|
echo "*** Test: Github issue #2062"
|
|
rm -fr ref_byte.zarr
|
|
unzip ref_byte.zarr.zip >> tmp_ignore.txt
|
|
rm -fr tmp_nczfill.cdl
|
|
${ZMD} -h "file://ref_byte.zarr#mode=zarr,$zext"
|
|
${NCDUMP} -s "file://ref_byte.zarr#mode=zarr,$zext" > tmp_nczfill.cdl
|
|
sclean tmp_nczfill.cdl tmp_byte_$zext.cdl
|
|
diff -wb ${srcdir}/ref_byte.cdl tmp_byte_$zext.cdl
|
|
rm -fr ref_byte.zarr
|
|
}
|
|
|
|
testcase2063() {
|
|
zext=$1
|
|
echo "*** Test: Github issue #2063"
|
|
rm -fr ref_byte_fill_value_null.zarr
|
|
unzip ref_byte_fill_value_null.zarr.zip >> tmp_ignore.txt
|
|
rm -fr tmp_nczfill.cdl
|
|
${ZMD} -h "file://ref_byte_fill_value_null.zarr#mode=zarr,$zext"
|
|
${NCDUMP} -s "file://ref_byte_fill_value_null.zarr#mode=zarr,$zext" > tmp_nczfill.cdl
|
|
sclean tmp_nczfill.cdl tmp_byte_fill_value_null_$zext.cdl
|
|
diff -wb ${srcdir}/ref_byte_fill_value_null.cdl tmp_byte_fill_value_null_$zext.cdl
|
|
rm -fr ref_byte_fill_value_null.zarr
|
|
}
|
|
|
|
if ! test -f ${ISOPATH}/ref_byte.zarr.zip ; then
|
|
cp -f ${srcdir}/ref_byte.zarr.zip ${ISOPATH}/ref_byte.zarr.zip
|
|
cp -f ${srcdir}/ref_byte_fill_value_null.zarr.zip ${ISOPATH}/ref_byte_fill_value_null.zarr.zip
|
|
fi
|
|
|
|
testcase2062 file
|
|
testcase2063 file
|
|
if test "x$FEATURE_HDF5" = xyes ; then
|
|
testcase2059 file
|
|
if test "x$FEATURE_NCZARR_ZIP" = xyes ; then
|
|
testcase2059 zip
|
|
fi
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then
|
|
testcase2059 s3
|
|
fi
|
|
fi
|
|
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then s3sdkdelete "/${S3ISOPATH}" ; fi # Cleanup
|