diff options
| author | Martin Willi <martin@revosec.ch> | 2015-03-18 14:28:17 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2015-03-18 14:29:45 +0100 |
| commit | 75a8457922005e25e37d5af42107b78b537f58fc (patch) | |
| tree | 47d2fedab4b1e6b0fea955c58fa68b89e25f2b39 | |
| parent | 2e74aa0a91e6f8e949a98f6069e210bcfbfdbd19 (diff) | |
| download | strongswan-75a8457922005e25e37d5af42107b78b537f58fc.tar.bz2 strongswan-75a8457922005e25e37d5af42107b78b537f58fc.tar.xz | |
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.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | scripts/test.sh | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index c7f0e84a5..46e7cfd6c 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 19a6c8da6..d21deaedc 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 |