From d0208901bb8512d9a860061679d1892f18306872 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 22 Sep 2022 13:09:00 -0600 Subject: [PATCH 1/8] Updated test logic in nc-config.in file. --- nc-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nc-config.in b/nc-config.in index 79999f646..e28b1a92d 100644 --- a/nc-config.in +++ b/nc-config.in @@ -10,7 +10,7 @@ libdir=@libdir@ includedir=@includedir@ plugindir=@PLUGIN_INSTALL_DIR@ -if test "x@PLUGIN_INSTALL_DIR@" == "xno" ; then +if test "@PLUGIN_INSTALL_DIR@" == "no" ; then plugindir="" fi From f396913e1e1dc054989e3c65a11b5336666018cb Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 22 Sep 2022 13:29:41 -0600 Subject: [PATCH 2/8] Corrected an error. --- nc-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nc-config.in b/nc-config.in index e28b1a92d..459df374b 100644 --- a/nc-config.in +++ b/nc-config.in @@ -10,7 +10,7 @@ libdir=@libdir@ includedir=@includedir@ plugindir=@PLUGIN_INSTALL_DIR@ -if test "@PLUGIN_INSTALL_DIR@" == "no" ; then +if test "@PLUGIN_INSTALL_DIR@" = "no" ; then plugindir="" fi From 90ed6b8aa0ecb4181b4807e35b97aa69ec3301bc Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 26 Sep 2022 13:04:10 -0600 Subject: [PATCH 3/8] For loop initial declarations are only allowed in C99 mode I get an error about "for loop initial declarations are only allowed in C99 mode" with the current code. Not sure why it hasn't shown up before. I am configuring with `BUILD_SHARED_LIBS=NO ENABLE_PLUGINS=NO ENABLE_MULTIFILTERS=NO ENABLE_NCZARR_FILTERS=NO` when the error shows up using gcc-7.2.0. --- nc_test4/tst_virtual_datasets.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nc_test4/tst_virtual_datasets.c b/nc_test4/tst_virtual_datasets.c index c27455713..1a4577fd0 100644 --- a/nc_test4/tst_virtual_datasets.c +++ b/nc_test4/tst_virtual_datasets.c @@ -12,7 +12,8 @@ static void create_dataset_a() { hsize_t dims[1] = {VARIABLE_SIZE}; float data[VARIABLE_SIZE]; - for(size_t i = 0; i < VARIABLE_SIZE; ++i) { + size_t i; + for(i = 0; i < VARIABLE_SIZE; ++i) { data[i] = (float)i; } @@ -51,6 +52,7 @@ create_dataset_b() { int read_back_contents(const char* filename) { int ncid, varid, ndims; + size_t i; float data[VARIABLE_SIZE]; char var_name[NC_MAX_NAME+1]; @@ -63,7 +65,7 @@ int read_back_contents(const char* filename) { if (nc_inq_var(ncid, varid, var_name, &var_type, &ndims, dimids_var, &natts)) ERR; if (nc_get_var_float(ncid, varid, data)) ERR; printf("\t %s: ", var_name); - for (size_t i = 0; i < VARIABLE_SIZE; ++i) { + for (i = 0; i < VARIABLE_SIZE; ++i) { printf("%f, ", data[i]); } printf("\n"); From c73967b0c251211b67a1dd67267161ab090733a6 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Wed, 28 Sep 2022 10:38:35 -0600 Subject: [PATCH 4/8] Correct nccopy4 dependency on tst_fillbug. --- ncdump/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt index df4fb5a88..e34b3f61f 100644 --- a/ncdump/CMakeLists.txt +++ b/ncdump/CMakeLists.txt @@ -264,7 +264,7 @@ endif() add_sh_test(ncdump tst_netcdf4_4) add_sh_test(ncdump tst_nccopy4) - SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2") + SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_sh_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2") SET_TESTS_PROPERTIES(ncdump_tst_nccopy5 PROPERTIES DEPENDS "ncdump_tst_nccopy4") ENDIF(USE_HDF5) From 96b285922b7e74178b93f89c986471f7e9ff43d4 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Wed, 28 Sep 2022 10:47:40 -0600 Subject: [PATCH 5/8] Added a dependency to tst_nans to nccopy4 --- ncdump/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt index e34b3f61f..d5cadb90a 100644 --- a/ncdump/CMakeLists.txt +++ b/ncdump/CMakeLists.txt @@ -264,7 +264,7 @@ endif() add_sh_test(ncdump tst_netcdf4_4) add_sh_test(ncdump tst_nccopy4) - SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_sh_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2") + SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_sh_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2;tst_nans") SET_TESTS_PROPERTIES(ncdump_tst_nccopy5 PROPERTIES DEPENDS "ncdump_tst_nccopy4") ENDIF(USE_HDF5) From 6befdad33aff3f5d821aa850e7b74e8542f7f57b Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Wed, 28 Sep 2022 11:32:57 -0600 Subject: [PATCH 6/8] Added additional dependencies. --- ncdump/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt index d5cadb90a..39610f803 100644 --- a/ncdump/CMakeLists.txt +++ b/ncdump/CMakeLists.txt @@ -264,7 +264,7 @@ endif() add_sh_test(ncdump tst_netcdf4_4) add_sh_test(ncdump tst_nccopy4) - SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_sh_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2;tst_nans") + SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_sh_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2;tst_nans;tst_opaque_data;tst_create_files;tst_special_atts") SET_TESTS_PROPERTIES(ncdump_tst_nccopy5 PROPERTIES DEPENDS "ncdump_tst_nccopy4") ENDIF(USE_HDF5) From b26348c21c5f44608bdd6ef34d6d2de2bc659d3f Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 30 Sep 2022 12:34:33 -0600 Subject: [PATCH 7/8] Add LDFLAGS for two plugins, nczstdfilters and nczhdf5filters, in support of https://github.com/Unidata/netcdf-c/issues/2478 --- plugins/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 777495ff6..c69679a57 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -74,6 +74,9 @@ if ENABLE_PLUGINS lib__nczstdfilters_la_SOURCES = NCZstdfilters.c lib__nczhdf5filters_la_SOURCES = NCZhdf5filters.c +lib__nczstdfilters_la_LDFLAGS = ${plugin_version_info} +lib__nczhdf5filters_la_LDFLAGS= ${plugin_version_info} + plugin_LTLIBRARIES += lib__nczhdf5filters.la plugin_LTLIBRARIES += lib__nczstdfilters.la From 4b815432e399daba9a8e6c6f0676e95985e930bb Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 30 Sep 2022 13:21:24 -0600 Subject: [PATCH 8/8] Add prepreqs to ncdump/tst_nccopy4, revising some race condition related errors. --- ncdump/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt index df4fb5a88..39610f803 100644 --- a/ncdump/CMakeLists.txt +++ b/ncdump/CMakeLists.txt @@ -264,7 +264,7 @@ endif() add_sh_test(ncdump tst_netcdf4_4) add_sh_test(ncdump tst_nccopy4) - SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2") + SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES DEPENDS "ncdump_run_ncgen_tests;ncdump_tst_output;ncdump_tst_ncgen4;ncdump_sh_tst_fillbug;ncdump_tst_netcdf4_4;ncdump_tst_h_scalar;tst_comp;tst_comp2;tst_nans;tst_opaque_data;tst_create_files;tst_special_atts") SET_TESTS_PROPERTIES(ncdump_tst_nccopy5 PROPERTIES DEPENDS "ncdump_tst_nccopy4") ENDIF(USE_HDF5)