Merge branch 'main' into tinyxmlupdate.dmh

Unidata · Oct 17, 2023 · 3e2971d · 3e2971d
2 parents 0701250 + 155ee93
commit 3e2971d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -8,7 +8,7 @@ This file contains a high-level description of this package's evolution. Release
 ## 4.9.3 - TBD
 
 * Update the internal copy of tinyxml2 to latest code. See [Github #2771](https://github.com/Unidata/netcdf-c/pull/2771).
-* Mitigate the problem of test interference. See [Github #2755](https://github.com/Unidata/netcdf-c/pull/2755).
+* Mitigate the problem of remote/nczarr-related test interference. See [Github #2755](https://github.com/Unidata/netcdf-c/pull/2755).
 * Extend NCZarr to support unlimited dimensions. See [Github #2755](https://github.com/Unidata/netcdf-c/pull/2755).
 * Fix significant bug in the NCZarr cache management. See [Github #2737](https://github.com/Unidata/netcdf-c/pull/2737).
 * Fix default parameters for caching of NCZarr. See [Github #2734](https://github.com/Unidata/netcdf-c/pull/2734).

diff --git a/dap4_test/CMakeLists.txt b/dap4_test/CMakeLists.txt
@@ -78,15 +78,4 @@ ENDIF(ENABLE_TESTS)
 #FILE(COPY ./cdltestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
 #FILE(COPY ./rawtestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
 
-## Specify files to be distributed by 'make dist'
-FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh
-${CMAKE_CURRENT_SOURCE_DIR}/cdltestfiles
-${CMAKE_CURRENT_SOURCE_DIR}/rawtestfiles
-${CMAKE_CURRENT_SOURCE_DIR}/baseline
-${CMAKE_CURRENT_SOURCE_DIR}/baselineraw
-${CMAKE_CURRENT_SOURCE_DIR}/baselineremote
-#${CMAKE_CURRENT_SOURCE_DIR}/baselinerthredds
-${CMAKE_CURRENT_SOURCE_DIR}/baselinehyrax
-)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
-ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
+
diff --git a/libdispatch/dpathmgr.c b/libdispatch/dpathmgr.c
@@ -168,6 +168,7 @@ NCpathcvt(const char* inpath)
     }
     nullfree(tmp1);
     clearPath(&inparsed);
+    //fprintf(stderr,">>> ncpathcvt: inpath=%s result=%s\n",inpath,result);
     return result;
 }
 

diff --git a/nczarr_test/run_interop.sh b/nczarr_test/run_interop.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
@@ -43,16 +45,19 @@ testcasezip() {
 }
 
 testcases3() {
+  set -x
   echo -e "\to Running S3 Testcase:\t$1\t$2"
   zext=s3
   base=$1
   mode=$2
   rm -f tmp_${base}_${zext}.cdl
   url="https://${UH}/${UB}/${base}.zarr#mode=${mode},s3"
+  echo "flags: $flags"
   # Dumping everything causes timeout so dump a single var
-  ${NCDUMP} -v "/group_with_dims/var2D" $flags $url > tmp_${base}_${zext}.cdl
+  ${NCDUMP} -v "group_with_dims/var2D" $flags $url > tmp_${base}_${zext}.cdl
   # Find the proper ref file
   diff -b ${ISOPATH}/ref_${base}_2d.cdl tmp_${base}_${zext}.cdl
+  set +x
 }
 
 testallcases() {

diff --git a/nczarr_test/run_notzarr.sh b/nczarr_test/run_notzarr.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-
+#set -x
+#set -e
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
@@ -29,7 +30,7 @@ cp ${srcdir}/ref_notzarr.tar.gz .
 gunzip ref_notzarr.tar.gz
 tar -xf ref_notzarr.tar
 if test "x$FEATURE_S3TESTS" = xyes ; then
-    ${execdir}/s3util -f notzarr.file/notzarr.txt -u "https://${URL}" -k "/${S3ISOPATH}/notzarr.s3/notzarr.txt" upload
+    ${execdir}/s3util -f notzarr.file/notzarr.txt -u "https://${URL}" -k "//${S3ISOPATH}/notzarr.s3/notzarr.txt" upload
 fi
 
 echo "Test empty file"

diff --git a/unit_test/run_s3sdk.sh b/unit_test/run_s3sdk.sh
@@ -14,7 +14,7 @@ isolate "testdir_uts3sdk"
 # Create an isolation path for S3; build on the isolation directory
 S3ISODIR="$ISODIR"
 S3ISOPATH="/${S3TESTSUBTREE}"
-S3ISOPATH="${S3ISOPATH}/$S3ISODIR"
+S3ISOPATH="/${S3ISOPATH}/$S3ISODIR"
 
 test_cleanup() {
 ${CMD} ${execdir}/../nczarr_test/s3util -u "${URL}" -k "${S3ISOPATH}" clear