aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-10-01 07:50:50 -0400
committerJack Lloyd <[email protected]>2017-10-01 07:50:50 -0400
commitdb5353c56b2af711c6196d76b8e153970f908e54 (patch)
tree61cafcb566471406442dbe822096b286ca5b1bed
parent73675579a676d8d6e28fea30c68c913e9f803b04 (diff)
Remove llvm package on Travis so we get a recent llvm-cov
-rwxr-xr-xsrc/scripts/ci/setup_travis.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh
index d4587596b..3c058bc19 100755
--- a/src/scripts/ci/setup_travis.sh
+++ b/src/scripts/ci/setup_travis.sh
@@ -61,6 +61,9 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
elif [ "$BUILD_MODE" = "sonar" ]; then
sudo apt-get -qq update
sudo apt-get install trousers libtspi-dev
+ # installed llvm-3.4 conflicts with clang-3.9 in /usr/local
+ # we need a more recent llvm-cov for coverage reports
+ sudo apt-get install llvm
tar -C / -xvjf botan-ci-tools/softhsm2-trusty-bin.tar.bz2
/tmp/softhsm/bin/softhsm2-util --init-token --free --label test --pin 123456 --so-pin 12345678