final1

.github/workflows/main-cmake.yml

@@ -1,6 +1,6 @@
 name: NetCDF-C CMake CI - Windows
 
-on: [ pull_request, workflow_dispatch]
+on: [push, pull_request, workflow_dispatch]
 
 env:
   REMOTETESTDOWN: no

.github/workflows/run_tests_osx.yml

@@ -6,7 +6,7 @@
 
 name: Run macOS-based netCDF Tests
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

.github/workflows/run_tests_ubuntu.yml

@@ -4,7 +4,7 @@
 
 name: Run Ubuntu/Linux netCDF Tests
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 env:
   REMOTETESTDOWN: no

.github/workflows/run_tests_win_cygwin.yml

@@ -1,6 +1,6 @@
 name: Run Cygwin-based tests
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

.github/workflows/run_tests_win_mingw.yml

@@ -10,7 +10,7 @@ env:
   CPPFLAGS: "-D_BSD_SOURCE"
   REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

Makefile.am

@@ -33,7 +33,7 @@ cmake CMakeLists.txt COMPILE.cmake.txt config.h.cmake.in		\
 cmake_uninstall.cmake.in FixBundle.cmake.in nc-config.cmake.in		\
 RELEASE_NOTES.md CTestConfig.cmake.in CTestCustom.cmake.in		\
 libnetcdf.settings.in netCDFConfig.cmake.in CMakeInstallation.cmake	\
-test-driver-verbose test_common.in fuzz CITATION.cff v3.tgz
+test-driver-verbose test_common.in fuzz CITATION.cff
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = netcdf.pc

configure.ac

@@ -2362,9 +2362,6 @@ AM_CONDITIONAL([AX_ENABLE], [test xyes = xyes])
 # Provide  conditional to identify tests that must be run manually
 AM_CONDITIONAL([AX_MANUAL], [test xno = xyes])
 
-# Initialize v3_nczarr_test
-cd v3_nczarr_test; rm -fr *; tar -xzf ../v3.tgz
-
 AC_MSG_NOTICE([generating header files and makefiles])
 AC_CONFIG_FILES(test_common.sh:test_common.in)
 AC_CONFIG_FILES(s3cleanup.sh:s3cleanup.in, [chmod ugo+x s3cleanup.sh])
@@ -2439,4 +2436,15 @@ AC_CONFIG_FILES([Makefile
                  ])
 AC_OUTPUT()
 
+# Initialize v3_nczarr_test
+AC_MSG_CHECKING([@@@ Initializing v3_nczarr_test])
+set -x
+mkdir -p v3_nczarr_test
+cd v3_nczarr_test
+find . -maxdepth 0 -type f -not \( -name CMakeLists.txt -or -name '*.am' -or -name Makefile.in \) -delete
+cp v3only/* .
+cd ..
+set +x
+AC_MSG_RESULT([done])
+
 cat libnetcdf.settings

ncdap_test/Makefile.am

@@ -57,7 +57,7 @@ TESTS += tst_remote3.sh testurl.sh
 # iridl.ldeo.columbia.edu
 TESTS += tst_encode.sh
 # test.opendap.org
-TESTS += tst_hyrax.sh
+#TESTS += tst_hyrax.sh # currently down
 # Various
 TESTS += tst_longremote3.sh
 tst_longremote3.log: tst_remote3.log

nczarr_test/Makefile.am

@@ -7,10 +7,10 @@ include $(top_srcdir)/lib_flags.am
 AM_TESTS_ENVIRONMENT += export NCZARRFORMAT=2;
 TESTS_ENVIRONMENT =
 TEST_EXTENSIONS = .sh
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
-sh_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
-LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
-TESTS_ENVIRONMENT += export SETX=1;
+#SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
+#sh_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
+#LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
+#TESTS_ENVIRONMENT += export SETX=1;
 
 AM_CFLAGS += -I${top_srcdir}
 AM_CPPFLAGS += -I${top_srcdir}

nczarr_test/run_cachetest.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_chunkcases.sh

@@ -13,7 +13,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 
 set -e
 

nczarr_test/run_corrupt.sh

@@ -6,7 +6,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_external.sh

@@ -5,7 +5,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 set -e
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 s3isolate "testdir_external"
 THISDIR=`pwd`

nczarr_test/run_fillonlyz.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 # This shell script tests bug reported in github issue 
 # https://github.com/Unidata/netcdf-c/issues/1826

nczarr_test/run_filter.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_filter_misc.sh

@@ -7,7 +7,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
 if test "x$TESTNCZARR" = x1; then
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 fi
 
 set -e

nczarr_test/run_filter_vlen.sh

@@ -9,7 +9,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
 if test "x$TESTNCZARR" = x1; then
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 fi
 
 set -e

nczarr_test/run_filterinstall.sh

@@ -11,7 +11,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
 if test "x$TESTNCZARR" = x1; then
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 fi
 
 set -e

nczarr_test/run_interop.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -x
 set -e

nczarr_test/run_it_chunks1.sh

@@ -6,7 +6,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_jsonconvention.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_misc.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -x
 set -e

nczarr_test/run_mud.sh

@@ -12,7 +12,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 set -e
 
 if test "x$TESTNCZARR" = x1 ; then
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 s3isolate "testdir_mud4"
 else
 isolate "testdir_mud4"

nczarr_test/run_nan.sh

@@ -8,13 +8,14 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 # Isolate both test and S3
 s3isolate "testdir_nan"
 THISDIR=`pwd`
 cd $ISOPATH
 
+set -x
 set -e
 
 # Location constants

nczarr_test/run_nccopy5.sh

@@ -9,7 +9,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 set -e
 
 if test "x$TESTNCZARR" = x1 ; then
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 s3isolate "testdir_nccopy5"
 else
 isolate testdir_ncccopy5

nczarr_test/run_ncgen4.sh

@@ -8,7 +8,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 # Isolate both test and S3
 s3isolate "testdir_ncgen4"

nczarr_test/run_nczarr_fill.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 s3isolate "testdir_nczarr_fill"
 THISDIR=`pwd`

nczarr_test/run_nczfilter.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 # This shell script runs test_nczfilter.c
 

nczarr_test/run_newformat.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_notzarr.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_nulls.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_perf_chunks1.sh

@@ -9,7 +9,7 @@
 
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 s3isolate "testdir_perf_chunks1"
 THISDIR=`pwd`

nczarr_test/run_purezarr.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_quantize.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 # Construct both ISOPATH and S3ISOPATH
 s3isolate "testdir_quantize"

nczarr_test/run_scalar.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 set -e
 

nczarr_test/run_specific_filters.sh

@@ -14,7 +14,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 set -e
 
 if test "x$TESTNCZARR" = x1 ; then
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 s3isolate "testdir_specific_filters"
 THISDIR=`pwd`
 cd $ISOPATH

nczarr_test/run_strings.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 # This shell script tests support for the NC_STRING type
 

nczarr_test/run_unknown.sh

@@ -11,7 +11,7 @@ THISDIR=`pwd`
 cd $ISOPATH
 
 if test "x$TESTNCZARR" = x1 ; then
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 s3isolate
 fi
 

nczarr_test/run_unlim_io.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 
 set -e
 

nczarr_test/run_ut_map.sh

@@ -5,7 +5,7 @@ export SETX=1
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. ${srcdir}/test_nczarr.sh
+. ${builddir}/test_nczarr.sh
 
 set -e
 

nczarr_test/run_ut_mapapi.sh

@@ -3,7 +3,7 @@
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
-. "${srcdir}/test_nczarr.sh"
+. "${builddir}/test_nczarr.sh"
 
 #TR="-T10"