formatfix

DennisHeimbigner · Aug 14, 2024 · 6f09a6a · 6f09a6a
2 parents 7aa2a1e + 8be572c
commit 6f09a6a
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 21 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]
 
 env:
   REMOTETESTDOWN: no

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]
 
 env:
   REMOTETESTDOWN: no

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.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

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
@@ -10,7 +10,7 @@ env:
   #CPPFLAGS: "-D_BSD_SOURCE"
   REMOTETESTDOWN: no
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/libnczarr/zsync.c b/libnczarr/zsync.c
@@ -1089,7 +1089,7 @@ ncz_read_superblock(NC_FILE_INFO_T* file, struct ZJSON* json)
 
     if(jsuper != NULL) {
 	if(jsuper->sort != NCJ_DICT) {stat = NC_ENCZARR; goto done;}
-	if((stat = NCJdictget(jsuper,"version",&jtmp))<0) {stat = NC_EINVAL; goto done;}
+	if((stat = dictgetalt(jsuper,"nczarr_version","version",&jtmp))<0) {stat = NC_EINVAL; goto done;}
 	nczarr_version = nulldup(NCJstring(jtmp));
     }
 
@@ -1663,8 +1663,7 @@ getnczarrkey(NCZ_FILE_INFO_T* zfile, NC_OBJ* container, struct ZJSON* json, cons
 	jxxx = NULL;
         if((stat = NCJdictget(json->atts,name,&jxxx))<0) {stat = NC_EINVAL; goto done;}
     }
-    if(name == NULL) {
-        jxxx = NULL;
+    if(jxxx == NULL) {
         /* Try .zxxx second */
 	if(json->obj != NULL) {
             if((stat = NCJdictget(json->obj,name,&jxxx))<0) {stat = NC_EINVAL; goto done;}

diff --git a/nc_test/Makefile.am b/nc_test/Makefile.am
@@ -126,13 +126,13 @@ tst_http_nc3.cdl tst_http_nc4?.cdl tmp*.cdl tmp*.nc
 
 EXTRA_DIST += bad_cdf5_begin.nc run_cdf5.sh nc_enddef.cdl
 if NETCDF_ENABLE_CDF5
-   # bad_cdf5_begin.nc is a corrupted CDF-5 file with bad variable starting
-   # file offsets. It is to be used by tst_open_cdf5.c to check if it can
-   # detect and report error code NC_ENOTNC.
-   TESTS          += run_cdf5.sh
-   check_PROGRAMS += tst_open_cdf5
+# bad_cdf5_begin.nc is a corrupted CDF-5 file with bad variable starting
+# file offsets. It is to be used by tst_open_cdf5.c to check if it can
+# detect and report error code NC_ENOTNC.
+TESTS          += run_cdf5.sh
+check_PROGRAMS += tst_open_cdf5
 if LARGE_FILE_TESTS
-   TESTPROGRAMS   += tst_large_cdf5 tst_cdf5_begin
+TESTPROGRAMS   += tst_large_cdf5 tst_cdf5_begin
 endif
 endif
 

diff --git a/ncdap_test/Makefile.am b/ncdap_test/Makefile.am
@@ -64,10 +64,10 @@ tst_longremote3.log: tst_remote3.log
 endif
 
 if NETCDF_ENABLE_DAP_LONG_TESTS
- test_manyurls_SOURCES = test_manyurls.c manyurls.h
- check_PROGRAMS += test_manyurls
- test_manyurls.log: tst_longremote3.log
- TESTS += test_manyurls
+test_manyurls_SOURCES = test_manyurls.c manyurls.h
+check_PROGRAMS += test_manyurls
+test_manyurls.log: tst_longremote3.log
+TESTS += test_manyurls
 endif
 
 TESTS += test_partvar

diff --git a/nczarr_test/Makefile.am b/nczarr_test/Makefile.am
@@ -108,16 +108,16 @@ TESTS += run_unlim_io.sh run_nccopyz.sh
 endif
 
 if LARGE_FILE_TESTS
-	check_PROGRAMS += test_writecaching test_readcaching
-	TESTS += run_cachetest.sh
+check_PROGRAMS += test_writecaching test_readcaching
+TESTS += run_cachetest.sh
 endif
 
 endif #NETCDF_BUILD_UTILITIES
 
 if NETCDF_BUILD_UTILITIES 
 
 if NETCDF_ENABLE_NCZARR_ZIP
-	TESTS += run_newformat.sh
+TESTS += run_newformat.sh
 endif
 
 if LARGE_FILE_TESTS

diff --git a/nczarr_test/ref_oldformat.zip b/nczarr_test/ref_oldformat.zip