upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Travis, fix location of libexpat, stop on error.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2021-03-23 16:27:49 +01:00
parent f11d99b6dc
commit 1af851e791
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.travis.yml
View file

@ -40,7 +40,7 @@ jobs:
arch: amd64 arch: amd64
env: env:
- TEST_OSX=yes - TEST_OSX=yes
- CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl" - CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat"
- TEST_ANALYZER=yes - TEST_ANALYZER=yes
- HOMEBREW_NO_AUTO_UPDATE=1 - HOMEBREW_NO_AUTO_UPDATE=1
- os: linux - os: linux
@ -65,7 +65,7 @@ jobs:
env: env:
- TEST_OSX=yes - TEST_OSX=yes
- TEST_LIBEVENT=yes - TEST_LIBEVENT=yes
- CONFIG_OPTS="--with-ssl=/usr/local/opt/openssl --with-libevent=/usr/local/opt/libevent" - CONFIG_OPTS="--with-ssl=/usr/local/opt/openssl --with-libevent=/usr/local/opt/libevent --with-libexpat=/usr/local/opt/expat"
- HOMEBREW_NO_AUTO_UPDATE=1 - HOMEBREW_NO_AUTO_UPDATE=1
- os: linux - os: linux
name: UBsan, GCC on Linux, Amd64 name: UBsan, GCC on Linux, Amd64
@ -327,13 +327,13 @@ script:
- | - |
if [ "$TEST_UBSAN" = "yes" ]; then if [ "$TEST_UBSAN" = "yes" ]; then
export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=undefined -fno-sanitize-recover" export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=undefined -fno-sanitize-recover"
./configure ./configure && \
make -j 2 make -j 2 && \
make test make test
elif [ "$TEST_ASAN" = "yes" ]; then elif [ "$TEST_ASAN" = "yes" ]; then
export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=address" export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=address"
./configure ./configure && \
make -j 2 make -j 2 && \
make test make test
elif [ "$TEST_IOS" = "yes" ]; then elif [ "$TEST_IOS" = "yes" ]; then
export AUTOTOOLS_BUILD="$(./config.guess)" export AUTOTOOLS_BUILD="$(./config.guess)"
@ -345,8 +345,8 @@ script:
--build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \ --build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \
--prefix="$IOS_PREFIX" \ --prefix="$IOS_PREFIX" \
--with-ssl="$IOS_PREFIX" --disable-gost \ --with-ssl="$IOS_PREFIX" --disable-gost \
--with-libexpat="$IOS_PREFIX"; --with-libexpat="$IOS_PREFIX"; && \
make -j 2 make -j 2 && \
make install make install
elif [ "$TEST_ANDROID" = "yes" ]; then elif [ "$TEST_ANDROID" = "yes" ]; then
export AUTOTOOLS_BUILD="$(./config.guess)" export AUTOTOOLS_BUILD="$(./config.guess)"
@ -359,20 +359,20 @@ script:
--build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \ --build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \
--prefix="$ANDROID_PREFIX" \ --prefix="$ANDROID_PREFIX" \
--with-ssl="$ANDROID_PREFIX" --disable-gost \ --with-ssl="$ANDROID_PREFIX" --disable-gost \
--with-libexpat="$ANDROID_PREFIX"; --with-libexpat="$ANDROID_PREFIX"; && \
make -j 2 make -j 2 && \
make install make install
elif [ "$TEST_OSX" = "yes" ]; then elif [ "$TEST_OSX" = "yes" ]; then
./configure --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl ./configure --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl && \
make -j 2 make -j 2 && \
make test make test && \
if [ "$TEST_ANALYZER" = "yes" ]; then if [ "$TEST_ANALYZER" = "yes" ]; then
(cd testdata/clang-analysis.tdir; bash clang-analysis.test) (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
fi fi
else else
./configure ${CONFIG_OPTS} ./configure ${CONFIG_OPTS} && \
make -j 2 make -j 2 && \
make test make test && \
if [ "$TEST_ANALYZER" = "yes" ]; then if [ "$TEST_ANALYZER" = "yes" ]; then
(cd testdata/clang-analysis.tdir; bash clang-analysis.test) (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
fi fi