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 c7f0e84a5037cdd7421ffd832e83a6109e5697b3..46e7cfd6c73d897d9e1cb165cd5e884e34f99373 100644 (file)
--- 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 19a6c8da6daf33b21900dd144ab176ecf610effd..d21deaedc790bd608c1a6d79229348972e027fe8 100755 (executable)
--- 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