aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2016-09-20 11:51:59 +0200
committerTobias Brunner <tobias@strongswan.org>2016-09-20 15:32:28 +0200
commit44280a1901d01844008983b9ac91bbce3a20acb7 (patch)
tree3c6a672e37c98308dbe9f620a40f3aa3e4753f16
parent1aec64a0315d8b3e44180514572b873ebe75341f (diff)
downloadstrongswan-44280a1901d01844008983b9ac91bbce3a20acb7.tar.bz2
strongswan-44280a1901d01844008983b9ac91bbce3a20acb7.tar.xz
travis: Don't disable connmark and forecast plugins anymore
They build fine on Ubuntu 14.04.
-rwxr-xr-xscripts/test.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/test.sh b/scripts/test.sh
index 68ad1d664..3a7c9d1a9 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -37,11 +37,7 @@ all)
--disable-systemd --disable-soup --disable-unwind-backtraces
--disable-svc --disable-dbghelp-backtraces --disable-socket-win
--disable-kernel-wfp --disable-kernel-iph --disable-winhttp"
- if test "$MONOLITHIC" = "yes"; then
- # Ubuntu 12.04 does not provide a proper -liptc pkg-config
- CONFIG="$CONFIG --disable-forecast --disable-connmark"
- fi
- # Ubuntu 12.04 does not provide libtss2-dev
+ # Ubuntu 14.04 does provide a too old libtss2-dev
CONFIG="$CONFIG --disable-aikpub2 --disable-tss-tss2"
# not enabled on the build server
CONFIG="$CONFIG --disable-af-alg"