From 24af02b00d49376db47b37896987e81e153b05ac Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 12 Sep 2018 13:12:44 +0200 Subject: [PATCH] travis: Use amalgamation build for Botan and build outside our source tree This merges all source files into botan_all.cpp, which reduces the build time by almost 50%. Building outside the strongSwan tree avoids analyzing Botan with sonarqube. --- scripts/test.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index 70994ed1bc..0cff488425 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -3,6 +3,8 @@ build_botan() { + BOTAN_DIR=$TRAVIS_BUILD_DIR/../botan + # if the leak detective is enabled we have to disable threading support # (used for std::async) as that causes invalid frees somehow, the # locking allocator causes a static leak via the first function that @@ -13,12 +15,13 @@ build_botan() fi # disable some larger modules we don't need for the tests BOTAN_CONFIG="$BOTAN_CONFIG --disable-modules=pkcs11,tls,x509,xmss" - git clone --depth 1 https://github.com/randombit/botan.git botan && - cd botan && - python ./configure.py $BOTAN_CONFIG && + git clone --depth 1 https://github.com/randombit/botan.git $BOTAN_DIR && + cd $BOTAN_DIR && + python ./configure.py --amalgamation $BOTAN_CONFIG && make -j4 libs >/dev/null && sudo make install >/dev/null && sudo ldconfig || exit $? + cd - } if test -z $TRAVIS_BUILD_DIR; then -- 2.47.2