test1

DennisHeimbigner · Sep 24, 2024 · f24bc7a · f24bc7a
1 parent d0c1ac2
commit f24bc7a
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 20 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: ${{ vars.REMOTETESTDOWN }}

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_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: ${{ vars.REMOTETESTDOWN }}

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: ${{ vars.REMOTETESTDOWN }}
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.20.0)
 
 #Project Name
 project(netCDF
-  LANGUAGES C CXX ASM
+  LANGUAGES C CXX
   HOMEPAGE_URL "https://www.unidata.ucar.edu/software/netcdf/"
   DESCRIPTION "NetCDF is a set of software libraries and machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data."
   VERSION 4.9.4
@@ -69,10 +69,6 @@ if(BUILD_SHARED_LIBS)
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
-if(MSVC)
-add_compile_options("/Gs10000000")
-endif()
-
 add_library(netcdf)
 add_library(netCDF::netcdf ALIAS netcdf)
 

diff --git a/include/netcdf.h b/include/netcdf.h
@@ -226,8 +226,6 @@ Use this in mode flags for both nc_create() and nc_open(). */
 #define NC_FORMATX_NCZARR    (10)
 #define NC_FORMATX_UNDEFINED (0)
 
-#define NC_FORMATX_COUNT (NC_FORMATX_NCZARR+1) /* range of formatx indices 0<formatx<NC_FORMATX_COUNT */
-
   /* To avoid breaking compatibility (such as in the python library),
    we need to retain the NC_FORMAT_xxx format as well. This may come
   out eventually, as the NC_FORMATX is more clear that it's an extended

diff --git a/include/netcdf_dispatch.h.in b/include/netcdf_dispatch.h.in
@@ -193,12 +193,6 @@ extern "C" {
     EXTERNL int NC_NOOP_inq_var_filter_info(int ncid, int varid, unsigned int id, size_t* nparams, unsigned int* params);
     EXTERNL int NC_NOOP_inq_filter_avail(int ncid, unsigned id);
 
-    EXTERNL int NC_NOOP_plugin_path_list(int ncid, size_t* npaths, char** pluginlist); /* Caller must free return value*/
-    EXTERNL int NC_NOOP_plugin_path_append(int ncid, const char *dir);
-    EXTERNL int NC_NOOP_plugin_path_prepend(int ncid, const char *dir);
-    EXTERNL int NC_NOOP_plugin_path_remove(int ncid, const char *dir);
-    EXTERNL int NC_NOOP_plugin_path_load(int ncid, const char *paths);
-
     EXTERNL int NC_NOTNC4_def_grp(int, const char *, int *);
     EXTERNL int NC_NOTNC4_rename_grp(int, const char *);
     EXTERNL int NC_NOTNC4_def_compound(int, size_t, const char *, nc_type *);

diff --git a/unit_test/run_pluginpaths.sh b/unit_test/run_pluginpaths.sh
@@ -116,6 +116,6 @@ for action in get ; do
 
 init
 testget
-#testset
+testset
 verify
-#cleanup
+cleanup
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,6 @@ for action in get ; do @@
     init
     testget
-    #testset
+    testset
     verify
-    #cleanup
+    cleanup