From: Martin Willi <martin@revosec.ch>
Date: Wed, 18 Mar 2015 13:28:17 +0000 (+0100)
Subject: travis: Install pip to install pytest in "all" tests
X-Git-Tag: 5.3.0rc1~28^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75a8457922005e25e37d5af42107b78b537f58fc;p=thirdparty%2Fstrongswan.git

travis: Install pip to install pytest in "all" tests

This allows ./configure to detect py.test, and execute python unit tests we
provide in the vici python egg.
---

diff --git a/.travis.yml b/.travis.yml
index c7f0e84a50..46e7cfd6c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq bison flex gperf gettext
   - ./scripts/test.sh deps
+  - ./scripts/test.sh pydeps
 
 script:
   - ./autogen.sh
diff --git a/scripts/test.sh b/scripts/test.sh
index 19a6c8da6d..d21deaedc7 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -52,7 +52,8 @@ all)
 	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 libjson0-dev iptables-dev"
+		  binutils-dev libunwind7-dev libjson0-dev iptables-dev python-pip"
+	PYDEPS="pytest"
 	;;
 win*)
 	CONFIG="--disable-defaults --enable-svc --enable-ikev2
@@ -95,6 +96,11 @@ if test "$1" = "deps"; then
 	exit $?
 fi
 
+if test "$1" = "pydeps"; then
+	test -z "$PYDEPS" || sudo pip -q install $PYDEPS
+	exit $?
+fi
+
 CONFIG="$CONFIG
 	--enable-silent-rules
 	--enable-test-vectors