Merge branch 'nczarr-experimental.dmh' of https://github.com/DennisHe…

…imbigner/netcdf-c into nczarr-experimental.dmh
Unidata · Jun 29, 2020 · 5c6fb13 · 5c6fb13
2 parents eeb2b8d + b47bee4
commit 5c6fb13
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/nczarr_test/run_it_test1.sh b/nczarr_test/run_it_test1.sh
@@ -84,9 +84,11 @@ if test "x$HAVE_SETTING" = x1 ; then HAVES3=1; fi
 
 rm -rf ${RESULTSDIR}
 
-#main nz4
-#main nzf
+main nz4
+main nzf
 
-if test "x$HAVENCZARR" = x1 -a "x$HAVES3" = x1 ; then
-  main s3 'https://stratus.ucar.edu/unidata-netcdf-zarr-testing'
+if test "x$NETCDF_S3_TESTS" != x ; then
+    if test "x$HAVENCZARR" = x1 -a "x$HAVES3" = x1 ; then
+      main s3 'https://stratus.ucar.edu/unidata-netcdf-zarr-testing'
+    fi
 fi
diff --git a/nczarr_test/run_it_test2.sh b/nczarr_test/run_it_test2.sh
@@ -60,6 +60,8 @@ if test "x$HAVE_SETTING" = x1 ; then HAVES3=1; fi
 main nz4
 main nzf
 
-if test "x$HAVENCZARR" = x1 -a "x$HAVES3" = x1 ; then
-main s3 'https://stratus.ucar.edu/unidata-netcdf-zarr-testing'
+if test "x$NETCDF_S3_TESTS" != x ; then
+    if test "x$HAVENCZARR" = x1 -a "x$HAVES3" = x1 ; then
+      main s3 'https://stratus.ucar.edu/unidata-netcdf-zarr-testing'
+    fi
 fi
diff --git a/nczarr_test/run_ut_mapapi.sh b/nczarr_test/run_ut_mapapi.sh
@@ -87,8 +87,12 @@ echo ""; echo "*** Test zmap_nz4"
 testmapcreate nz4; testmapmeta nz4; testmapdata nz4; testmapsearch nz4
 echo ""; echo "*** Test zmap_nzf"
 testmapcreate nzf; testmapmeta nzf; testmapdata nzf; testmapsearch nzf
+
+if test "x$NETCDF_S3_TESTS" != x ; then
 if test "x$HAVENCZARR" = x1 -a "x$HAVES3" = x1 ; then
 echo ""; echo "*** Test zmap_s3sdk"
 testmapcreate s3; testmapmeta s3; testmapdata s3; testmapsearch s3
 fi
+fi
+
 exit 0