aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-10-01 06:58:21 -0400
committerJack Lloyd <[email protected]>2017-10-01 06:58:21 -0400
commit87ddc6407460d9504a25379ce605a442535c3806 (patch)
treea9d563645e9ced65de3f90d89fb619e9acb85872
parent7b1fa2b7798264f2866eb80ca43181efddb66141 (diff)
Need SoftHSM for sonar build now
-rwxr-xr-xsrc/scripts/ci/setup_travis.sh12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh
index cfe78442a..d4587596b 100755
--- a/src/scripts/ci/setup_travis.sh
+++ b/src/scripts/ci/setup_travis.sh
@@ -45,6 +45,11 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
sudo apt-get -qq update
sudo apt-get install trousers libtspi-dev
+ # SoftHSMv1 in 14.04 does not work
+ # Installs prebuilt SoftHSMv2 binaries into /tmp
+ 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
+
# need updated lcov for gcc 4.8 coverage format
sudo dpkg -i botan-ci-tools/ubuntu/lcov_1.12-2_all.deb
@@ -53,12 +58,13 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
pip install --user coverage
pip install --user codecov
- # SoftHSMv1 in 14.04 does not work
- # Installs prebuilt SoftHSMv2 binaries into /tmp
+ elif [ "$BUILD_MODE" = "sonar" ]; then
+ sudo apt-get -qq update
+ sudo apt-get install trousers libtspi-dev
+
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
- elif [ "$BUILD_MODE" = "sonar" ]; then
wget https://sonarqube.com/static/cpp/build-wrapper-linux-x86.zip
unzip build-wrapper-linux-x86.zip