mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-03-25 17:40:27 +08:00
Merge branch 'main' into vlenperf.dmh
This commit is contained in:
Ward Fisher
GitHub
commit
258ad3fabe
13
.github/workflows/run_tests_win_cygwin.yml
vendored
13
.github/workflows/run_tests_win_cygwin.yml
vendored
@ -15,6 +15,10 @@ jobs:
|
||||
shell: bash -eo pipefail -o igncr "{0}"
|
||||
|
||||
name: Cygwin-based Autotools tests
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
plugin_dir_option: ["", "--without-plugin-dir"]
|
||||
|
||||
steps:
|
||||
- name: Fix line endings
|
||||
@ -41,9 +45,12 @@ jobs:
|
||||
|
||||
- name: (Autotools) Configure in-tree build
|
||||
run: >-
|
||||
/bin/dash ./configure --enable-hdf5 --enable-shared
|
||||
--disable-static --enable-dap --disable-dap-remote-tests
|
||||
--enable-plugins --enable-nczarr
|
||||
/bin/dash ./configure --enable-hdf5 --enable-shared
|
||||
--disable-static --enable-dap --disable-dap-remote-tests
|
||||
--enable-plugins ${{ matrix.plugin_dir_option }}
|
||||
--disable-nczarr --disable-nczarr-filters
|
||||
--disable-nczarr-s3 --disable-nczarr-s3-tests
|
||||
|
||||
|
||||
- name: Look at config.log if error
|
||||
if: ${{ failure() }}
|
||||
|
||||
@ -2205,7 +2205,7 @@ MACRO(print_conf_summary)
|
||||
|
||||
MESSAGE("")
|
||||
ENDMACRO()
|
||||
##
|
||||
##specific
|
||||
# Shell script Macro
|
||||
##
|
||||
# Determine if 'bash' is on the system.
|
||||
@ -2232,7 +2232,7 @@ ENDIF(ENABLE_BASH_SCRIPT_TESTING)
|
||||
|
||||
MACRO(add_sh_test prefix F)
|
||||
IF(HAVE_BASH)
|
||||
ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=${CMAKE_CURRENT_SOURCE_DIR};export TOPSRCDIR=${CMAKE_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}/${F}.sh ${ARGN}")
|
||||
ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=${CMAKE_CURRENT_SOURCE_DIR};export TOPSRCDIR=${CMAKE_SOURCE_DIR};bash ${CMAKE_CURRENT_BINARY_DIR}/${F}.sh ${ARGN}")
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
|
||||
|
||||
@ -7,8 +7,8 @@ This file contains a high-level description of this package's evolution. Release
|
||||
|
||||
## 4.9.3 - TBD
|
||||
|
||||
|
||||
* Improve performance and testing of the new nc_reclaim/copy functions. See [Github #2699](https://github.com/Unidata/netcdf-c/pull/2699).
|
||||
* [Bug Fix] Provide a partial fix to the libcurl certificates problem. See [Github #2690](https://github.com/Unidata/netcdf-c/pull/2690).
|
||||
* Improve S3 documentation, testing, and support See [Github #2686](https://github.com/Unidata/netcdf-c/pull/2686).
|
||||
* Remove obsolete code. See [Github #2680](https://github.com/Unidata/netcdf-c/pull/2680).
|
||||
* [Bug Fix] Add a crude test to see if an NCZarr path looks like a valid NCZarr/Zarr file. See [Github #2658](https://github.com/Unidata/netcdf-c/pull/2658).
|
||||
|
||||
@ -530,19 +530,19 @@ AC_MSG_RESULT([${havecurloption}])
|
||||
if test $havecurloption = yes; then
|
||||
AC_DEFINE([HAVE_CURLOPT_KEEPALIVE],[1],[Is CURLOPT_TCP_KEEPALIVE defined])
|
||||
fi
|
||||
|
||||
# CURLOPT_VERIFYHOST semantics differ depending on version
|
||||
AC_MSG_CHECKING([whether libcurl is version 7.66 or later?])
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
|
||||
[#include "curl/curl.h"],
|
||||
[[
|
||||
#if LIBCURL_VERSION_NUM < 0x074200
|
||||
#if !CURL_AT_LEAST_VERSION(7,66,0)
|
||||
error "<7.66";
|
||||
#endif
|
||||
]])], [libcurl766=yes], [libcurl766=no])
|
||||
|
||||
AC_MSG_RESULT([$libcurl766])
|
||||
if test x$libcurl66 = xno; then
|
||||
AC_DEFINE([HAVE_LIBCURL_766],[1],[Is libcurl version 7.66 or later])
|
||||
if test x$libcurl766 = xyes; then
|
||||
AC_DEFINE([HAVE_LIBCURL_766],[1],[libcurl version is 7.66 or later])
|
||||
fi
|
||||
|
||||
CFLAGS="$SAVECFLAGS"
|
||||
|
||||
@ -569,11 +569,12 @@ rcequal(NCRCentry* e1, NCRCentry* e2)
|
||||
nulltest = 0;
|
||||
if(e1->host == NULL) nulltest |= 1;
|
||||
if(e2->host == NULL) nulltest |= 2;
|
||||
/* Use host to decide if entry applies */
|
||||
switch (nulltest) {
|
||||
case 0: if(strcmp(e1->host,e2->host) != 0) {return 0;} break;
|
||||
case 1: return 0;
|
||||
case 2: return 0;
|
||||
case 3: break;
|
||||
case 1: break; /* .rc->host == NULL && candidate->host != NULL */
|
||||
case 2: return 0; /* .rc->host != NULL && candidate->host == NULL */
|
||||
case 3: break; /* .rc->host == NULL && candidate->host == NULL */
|
||||
default: return 0;
|
||||
}
|
||||
/* test urlpath take NULL into account*/
|
||||
@ -582,9 +583,9 @@ rcequal(NCRCentry* e1, NCRCentry* e2)
|
||||
if(e2->urlpath == NULL) nulltest |= 2;
|
||||
switch (nulltest) {
|
||||
case 0: if(strcmp(e1->urlpath,e2->urlpath) != 0) {return 0;} break;
|
||||
case 1: return 0;
|
||||
case 2: return 0;
|
||||
case 3: break;
|
||||
case 1: break; /* .rc->urlpath == NULL && candidate->urlpath != NULL */
|
||||
case 2: return 0; /* .rc->urlpath != NULL && candidate->urlpath == NULL */
|
||||
case 3: break; /* .rc->urlpath == NULL && candidate->urlpath == NULL */
|
||||
default: return 0;
|
||||
}
|
||||
return 1;
|
||||
|
||||
@ -21,8 +21,10 @@ FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/../nc_test4/tst_specific_filters.sh SPSOUR
|
||||
STRING(PREPEND SPSOURCE "#!/bin/bash\n")
|
||||
STRING(PREPEND SPSOURCE "TESTNCZARR=1\n")
|
||||
# Replace with FILE(CONFIGURE) when cmake 3.18 is in common use
|
||||
|
||||
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/run_specific_filters.1 "${SPSOURCE}")
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/run_specific_filters.1 ${CMAKE_CURRENT_BINARY_DIR}/run_specific_filters.sh FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE @ONLY NEWLINE_STYLE LF)
|
||||
|
||||
FILE(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/run_specific_filters.1)
|
||||
|
||||
FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/../nc_test4/tst_unknown.sh SPSOURCE)
|
||||
@ -130,26 +132,26 @@ IF(ENABLE_TESTS)
|
||||
add_sh_test(nczarr_test run_s3_cleanup)
|
||||
ENDIF()
|
||||
|
||||
IF(ENABLE_FILTER_TESTING)
|
||||
build_bin_test(tst_nczfilter)
|
||||
build_bin_test(testfilter)
|
||||
build_bin_test(testfilter_misc)
|
||||
build_bin_test(testfilter_multi)
|
||||
build_bin_test(testfilter_order)
|
||||
build_bin_test(testfilter_repeat)
|
||||
build_bin_test(test_filter_avail)
|
||||
ADD_SH_TEST(nczarr_test run_nczfilter)
|
||||
ADD_SH_TEST(nczarr_test run_filter)
|
||||
ADD_SH_TEST(nczarr_test run_specific_filters)
|
||||
IF(FALSE)
|
||||
IF(ENABLE_FILTER_TESTING)
|
||||
build_bin_test(tst_nczfilter)
|
||||
build_bin_test(testfilter)
|
||||
build_bin_test(testfilter_misc)
|
||||
build_bin_test(testfilter_multi)
|
||||
build_bin_test(testfilter_order)
|
||||
build_bin_test(testfilter_repeat)
|
||||
build_bin_test(test_filter_avail)
|
||||
ADD_SH_TEST(nczarr_test run_nczfilter)
|
||||
ADD_SH_TEST(nczarr_test run_filter)
|
||||
ADD_SH_TEST(nczarr_test run_specific_filters)
|
||||
IF(FALSE)
|
||||
# This test is too dangerous to run in a parallel make environment.
|
||||
# It causes race conditions. So suppress and only test by hand.
|
||||
ADD_SH_TEST(nczarr_test run_unknown)
|
||||
ENDIF(FALSE)
|
||||
ENDIF(ENABLE_FILTER_TESTING)
|
||||
if(ENABLE_NCZARR_ZIP)
|
||||
add_sh_test(nczarr_test run_newformat)
|
||||
endif()
|
||||
# It causes race conditions. So suppress and only test by hand.
|
||||
ADD_SH_TEST(nczarr_test run_unknown)
|
||||
ENDIF(FALSE)
|
||||
ENDIF(ENABLE_FILTER_TESTING)
|
||||
if(ENABLE_NCZARR_ZIP)
|
||||
add_sh_test(nczarr_test run_newformat)
|
||||
endif()
|
||||
|
||||
ENDIF(BUILD_UTILITIES)
|
||||
|
||||
|
||||
@ -130,6 +130,7 @@ ocset_curlflag(OCstate* state, int flag)
|
||||
case CURLOPT_USE_SSL:
|
||||
case CURLOPT_SSLCERT: case CURLOPT_SSLKEY:
|
||||
case CURLOPT_SSL_VERIFYPEER: case CURLOPT_SSL_VERIFYHOST:
|
||||
case CURLOPT_CAINFO: case CURLOPT_CAPATH:
|
||||
{
|
||||
struct ssl* ssl = &state->auth->ssl;
|
||||
/* VERIFYPEER == 0 => VERIFYHOST == 0 */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user