aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rwxr-xr-xscripts/test.sh8
2 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 04838e8a0..99176ba00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
language: c
+sudo: required
+dist: trusty
+
compiler:
- gcc
- clang
diff --git a/scripts/test.sh b/scripts/test.sh
index 1d94b9bf0..9365492ef 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -50,7 +50,7 @@ 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 python-pip
+ binutils-dev libunwind8-dev libjson0-dev iptables-dev python-pip
libtspi-dev"
PYDEPS="pytest"
;;
@@ -67,16 +67,16 @@ win*)
# no make check for Windows binaries
TARGET=
CFLAGS="$CFLAGS -mno-ms-bitfields"
- DEPS="gcc-mingw-w64-base mingw-w64-dev"
+ DEPS="gcc-mingw-w64-base"
case "$TEST" in
win64)
CONFIG="--host=x86_64-w64-mingw32 $CONFIG"
- DEPS="gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64 $DEPS"
+ DEPS="gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-x86-64-dev $DEPS"
CC="x86_64-w64-mingw32-gcc"
;;
win32)
CONFIG="--host=i686-w64-mingw32 $CONFIG"
- DEPS="gcc-mingw-w64-i686 binutils-mingw-w64-i686 $DEPS"
+ DEPS="gcc-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-i686-dev $DEPS"
CC="i686-w64-mingw32-gcc"
;;
esac