diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml index 85dee08450..7ac9fcd8f5 100644 --- a/.github/workflows/main-cmake.yml +++ b/.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 diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml index bcf0e7c6e4..ccf359ec3a 100644 --- a/.github/workflows/run_tests_osx.yml +++ b/.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 }} diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml index 488ba1d533..bd1accfc8d 100644 --- a/.github/workflows/run_tests_win_cygwin.yml +++ b/.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 }} diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml index d326ae4dcb..0251faa893 100644 --- a/.github/workflows/run_tests_win_mingw.yml +++ b/.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 }} diff --git a/nczarr_test/Makefile.am b/nczarr_test/Makefile.am index e8f0f34fff..800d164005 100644 --- a/nczarr_test/Makefile.am +++ b/nczarr_test/Makefile.am @@ -7,10 +7,10 @@ include $(top_srcdir)/lib_flags.am AM_TESTS_ENVIRONMENT += export NCZARRFORMAT=2;export NCNOZMETADATA=1; 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} diff --git a/nczarr_test/run_consolidated_zarr.sh b/nczarr_test/run_consolidated_zarr.sh index 8fe7042741..d11c71c157 100755 --- a/nczarr_test/run_consolidated_zarr.sh +++ b/nczarr_test/run_consolidated_zarr.sh @@ -5,7 +5,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . "$srcdir/test_nczarr.sh" -set -x set -e s3isolate "testdir_consolidated_zarr" @@ -14,7 +13,6 @@ cd $ISOPATH # Force use of consolidated metadata unset NCNOZMETADATA -echo "@@@ NCZARRFORMAT=$NCZARRFORMAT NCNOZMETADATA=$NCNOZMETADATA" # Locate the plugin path if ! findplugin h5blosc ; then exit 0; fi @@ -76,4 +74,3 @@ testcase file testcase_csl_vs_no file if test "x$FEATURE_NCZARR_ZIP" = xyes ; then testcase zip; fi if test "x$FEATURE_S3TESTS" = xyes ; then testcase s3; fi - diff --git a/v3_nczarr_test/Makefile.am b/v3_nczarr_test/Makefile.am index 30cda2b6af..250b059615 100644 --- a/v3_nczarr_test/Makefile.am +++ b/v3_nczarr_test/Makefile.am @@ -7,10 +7,10 @@ include $(top_srcdir)/lib_flags.am AM_TESTS_ENVIRONMENT += export NCZARRFORMAT=3;export NCNOZMETADATA=1; 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} diff --git a/v3_nczarr_test/run_consolidated_zarr.sh b/v3_nczarr_test/run_consolidated_zarr.sh index 5b613143d7..079d088442 100755 --- a/v3_nczarr_test/run_consolidated_zarr.sh +++ b/v3_nczarr_test/run_consolidated_zarr.sh @@ -5,7 +5,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . "$srcdir/test_nczarr.sh" -set -x set -e s3isolate "testdir_consolidated_zarr" @@ -14,9 +13,6 @@ cd $ISOPATH # Force use of consolidated metadata unset NCNOZMETADATA -echo "@@@" -echo "$NCZARRFORMAT" -echo "$NCNOZMETADA" # Locate the plugin path if ! findplugin h5blosc ; then exit 0; fi @@ -70,4 +66,3 @@ testcase file testcase_csl_vs_no file if test "x$FEATURE_NCZARR_ZIP" = xyes ; then testcase zip; fi if test "x$FEATURE_S3TESTS" = xyes ; then testcase s3; fi -