build1

DennisHeimbigner · Apr 27, 2024 · 0d0c9f9 · 0d0c9f9
1 parent 500c565
commit 0d0c9f9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git 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]
 
 concurrency:  
   group: ${{ github.workflow }}-${{ github.head_ref }}  

diff --git 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
@@ -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
@@ -9,7 +9,7 @@ name: Run MSYS2, MinGW64-based Tests (Not Visual Studio)
 env:
   CPPFLAGS: "-D_BSD_SOURCE"
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/libdispatch/datomic.c b/libdispatch/datomic.c
@@ -121,7 +121,7 @@ NC4_inq_atomic_typeid(int ncid, const char *name, nc_type *typeidp)
 	    return NC_NOERR;
         }
     }
-    return NC_EBADTYPID;
+    return NC_EBADTYPE;
 }
 
 /**

diff --git a/libnczarr/zdebug.h b/libnczarr/zdebug.h
@@ -5,7 +5,7 @@
 #ifndef ZDEBUG_H
 #define ZDEBUG_H
 
-#undef ZCATCH /* Warning: significant performance impact */
+#define ZCATCH /* Warning: significant performance impact */
 #undef ZTRACING /* Warning: significant performance impact */
 
 #undef ZDEBUG /* general debug */

diff --git a/libsrc4/nc4type.c b/libsrc4/nc4type.c
@@ -479,7 +479,7 @@ NC4_inq_typeid(int ncid, const char *name, nc_type *typeidp)
     NC_FILE_INFO_T *h5;
     NC_TYPE_INFO_T *type = NULL;
     char *norm_name = NULL;
-    int i, retval = NC_NOERR;
+    int retval = NC_NOERR;
 
     /* Normalize name. */
     if (!(norm_name = (char*)malloc(strlen(name) + 1)))
@@ -489,7 +489,7 @@ NC4_inq_typeid(int ncid, const char *name, nc_type *typeidp)
 
     switch(retval = NC4_inq_atomic_typeid(ncid,norm_name,typeidp)) {
     case NC_NOERR: goto done;
-    case NC_EBADTYPID: retval = NC_NOERR; break;
+    case NC_EBADTYPE: retval = NC_NOERR; break;
     default: goto done;
     }
 
@@ -576,9 +576,10 @@ nc4_get_typeclass(const NC_FILE_INFO_T *h5, nc_type xtype, int *type_class)
     assert(type_class);
 
     /* If this is an atomic type, the answer is easy. */
-    switch (retval = NC4_get_atomic_typeclass(xtype,type_class)) {
+    retval = NC4_get_atomic_typeclass(xtype,type_class);
+    switch (retval) {
     case NC_NOERR: goto exit;
-    case NC_EBADTYPID: break;
+    case NC_EBADTYPE: break;
     default: goto exit;
     }
     /* See if it's a used-defined type */

diff --git a/nc_test4/Makefile.am b/nc_test4/Makefile.am
@@ -11,10 +11,10 @@
 include $(top_srcdir)/lib_flags.am
 
 # Un comment to use a more verbose test driver
-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;
 
 TEST_EXTENSIONS = .sh
-Original file line number
+Diff line change
@@ Expand Up @@
     	    return NC_NOERR;
             }
         }
-        return NC_EBADTYPID;
+        return NC_EBADTYPE;
     }
     /**
@@ Expand Down @@