From: Tobias Brunner <tobias@strongswan.org>
Date: Sat, 1 Mar 2014 07:49:52 +0000 (+0100)
Subject: travis: Install dependencies for each test dynamically
X-Git-Tag: 5.1.3dr1~5^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60a0bb67674bb472ce69564ebd0cc98c8ca6256c;p=thirdparty%2Fstrongswan.git

travis: Install dependencies for each test dynamically

Since the installation of all packages alone takes several minutes this
should speed up some test cases.
---

diff --git a/.travis.yml b/.travis.yml
index 8209ca9f1a..affab27fbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,15 +7,7 @@ compiler:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq bison flex gperf gettext
-  # TODO: modularize this to speed up builds (e.g. call 'test.sh deps' to do this for the current TEST)
-  - sudo apt-get install -qq libgmp-dev libssl-dev libgcrypt11-dev
-  - sudo apt-get install -qq libcurl4-gnutls-dev libsoup2.4-dev
-  - sudo apt-get install -qq libunbound-dev libldns-dev
-  - sudo apt-get install -qq libmysqlclient-dev libsqlite3-dev
-  - sudo apt-get install -qq clearsilver-dev libfcgi-dev
-  - sudo apt-get install -qq libnm-glib-dev libnm-glib-vpn-dev
-  - sudo apt-get install -qq libpcsclite-dev libpam0g-dev
-  - sudo apt-get install -qq binutils-dev libunwind7-dev
+  - ./scripts/test.sh deps
 
 script:
   - ./autogen.sh
diff --git a/scripts/test.sh b/scripts/test.sh
index 9b38c11361..30e851e319 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -9,14 +9,18 @@ cd $TRAVIS_BUILD_DIR
 
 TARGET=check
 
+DEPS="libgmp-dev"
+
 case "$TEST" in
 default)
 	;;
 openssl)
 	CONFIG="--disable-defaults --enable-tools --enable-openssl"
+	DEPS="libssl-dev"
 	;;
 gcrypt)
 	CONFIG="--disable-defaults --enable-tools --enable-gcrypt --enable-pkcs1"
+	DEPS="libgcrypt11-dev"
 	;;
 all)
 	CONFIG="--enable-all --disable-android-dns --disable-android-log
@@ -29,6 +33,10 @@ all)
 	CONFIG="$CONFIG --disable-vstr"
 	# TODO: enable? perhaps via coveralls.io (cpp-coveralls)?
 	CONFIG="$CONFIG --disable-coverage"
+	DEPS="$DEPS libcurl4-gnutls-dev libsoup2.4-dev libunbound-dev libldns-dev
+		  libmysqlclient-dev libsqlite3-dev clearsilver-dev libfcgi-dev
+		  libnm-glib-dev libnm-glib-vpn-dev libpcsclite-dev libpam0g-dev
+		  binutils-dev libunwind7-dev"
 	;;
 dist)
 	TARGET=distcheck
@@ -39,6 +47,11 @@ dist)
 	;;
 esac
 
+if test "$1" = "deps"; then
+	sudo apt-get install -qq $DEPS
+	exit $?
+fi
+
 CONFIG="$CONFIG
 	--enable-silent-rules
 	--enable-test-vectors