From 6429973667f2e4cef1ba2679cbdb2c7c84e67af7 Mon Sep 17 00:00:00 2001 From: Charles-Henri Bruyand Date: Sat, 15 Jun 2024 12:51:35 +0200 Subject: [PATCH] dnsdist: update test runner for mac with dynamic prefix and up to date package name for curl --- regression-tests.dnsdist/runtests | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/regression-tests.dnsdist/runtests b/regression-tests.dnsdist/runtests index 23e6e54e33..40e65aaa7f 100755 --- a/regression-tests.dnsdist/runtests +++ b/regression-tests.dnsdist/runtests @@ -11,14 +11,16 @@ python -V if [ `uname -s` == Darwin ] then - if [ ! -e /usr/local/opt/curl-openssl ] + BREW_CURL_PREFIX=$(brew --prefix curl) + if [ ! -e "${BREW_CURL_PREFIX}" ] then - echo Please run: brew install curl-openssl, and try again + echo Please run: brew install curl, and try again exit 1 else - export PYCURL_CURL_CONFIG=/usr/local/opt/curl-openssl/bin/curl-config - export LDFLAGS=-L/usr/local/opt/openssl/lib - export CPPFLAGS=-I/usr/local/opt/openssl/include + export PYCURL_CURL_CONFIG="${BREW_CURL_PREFIX}/bin/curl-config" + export LDFLAGS="-L${BREW_CURL_PREFIX}/lib${LDFLAGS+ $LDFLAGS}" + export CPPFLAGS="-I${BREW_CURL_PREFIX}/include${CPPFLAGS+ $CPPFLAGS}" + export PKG_CONFIG_PATH="${BREW_CURL_PREFIX}/lib/pkgconfig" fi fi pip install -U pip wheel | cat -- 2.47.2