mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-03 08:01:25 +08:00
1552d894a2
re: Issue https://github.com/Unidata/netcdf-c/issues/2748 This PR fixes a number of issues and bugs. ## s3cleanup fixes * Delete extraneous s3cleanup.sh related files. * Remove duplicate s3cleanup.uids entries. ## Support the Google S3 API * Add code to recognize "storage.gooleapis.com" * Add extra code to track the kind of server being accessed: unknown, Amazon, Google. * Add a new mode flag "gs3" (analog to "s3") to support this api. * Modify the S3 URL code to support this case. * Modify the listobjects result parsing because Google returns some non-standard XML elements. * Change signature and calls for NC_s3urlrebuild. ## Handle corrupt Zarr files where shape is empty for a variable. Modify behavior when a variable's "shape" dictionary entry. Previously it returned an error, but now it suppresses such a variable. This change makes it possible to read non-corrupt data from the file. Also added a test case. ## Misc. Other Changes * Fix the nclog level handling to suppress output by default. * Fix de-duplicates code in ncuri.c * Restore testing of iridl.ldeo.columbia.edu. * Fix bug in define_vars() which did not always do a proper reclaim between variables.
63 lines
1.5 KiB
Bash
Executable File
63 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. "$top_srcdir/nczarr_test/test_nczarr.sh"
|
|
|
|
set -e
|
|
|
|
s3isolate "testdir_scalar"
|
|
THISDIR=`pwd`
|
|
cd $ISOPATH
|
|
|
|
# This shell script tests support for the NC_STRING type
|
|
|
|
zarrscalar() {
|
|
rm -f $2
|
|
sed -e '/dimensions:/d' -e '/_scalar_ =/d' -e '/int v/ s|(_scalar_)||' <$1 >$2
|
|
}
|
|
|
|
testcase() {
|
|
zext=$1
|
|
|
|
echo "*** Test: scalar write/read"
|
|
|
|
# Get pure zarr args
|
|
fileargs tmp_scalar_zarr "mode=zarr,$zext"
|
|
zarrurl="$fileurl"
|
|
zarrfile="$file"
|
|
# Get nczarr args
|
|
fileargs tmp_scalar_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" $top_srcdir/nczarr_test/ref_scalar.cdl
|
|
echo "*** create nczarr file"
|
|
${NCGEN} -4 -b -o "$nczarrurl" $top_srcdir/nczarr_test/ref_scalar.cdl
|
|
|
|
echo "*** read purezarr"
|
|
${NCDUMP} -n ref_scalar $zarrurl > tmp_scalar_zarr_${zext}.cdl
|
|
${ZMD} -h $zarrurl > tmp_scalar_zarr_${zext}.txt
|
|
echo "*** read nczarr"
|
|
${NCDUMP} -n ref_scalar $nczarrurl > tmp_scalar_nczarr_${zext}.cdl
|
|
${ZMD} -h $nczarrurl > tmp_scalar_nczarr_${zext}.txt
|
|
|
|
echo "*** verify"
|
|
diff -bw $top_srcdir/nczarr_test/ref_scalar.cdl tmp_scalar_nczarr_${zext}.cdl
|
|
|
|
# Fixup
|
|
zarrscalar tmp_scalar_zarr_${zext}.cdl tmp_rescale_zarr_${zext}.cdl
|
|
diff -bw $top_srcdir/nczarr_test/ref_scalar.cdl tmp_rescale_zarr_${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
|