.travis.yml: Add pinned vivid for gettext and clean up a bit

[apt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b413134c5b345e2da36cd7856381b7664c571cdc..8be0285e004f71909d0e777f0cdd70924b78a7e5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,19 @@
 language: cpp
+sudo: required
 before_install:
- - sudo apt-get update -q
+ - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+ - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ vivid main' -y
+ - |
+   sudo sh -c '/bin/echo -e "Package: *\nPin: release n=vivid\nPin-Priority: 1" > /etc/apt/preferences.d/vivid'
+ - sudo apt-get update -qq
+install:
  - sudo ./prepare-release travis-ci
- - sudo apt-get install -q --no-install-recommends stunnel4
-script: make && make test && test/integration/run-tests
+ - sudo apt-get -qq -y install gcc-4.8 g++-4.8
+ - sudo apt-get -qq -y -t vivid install gettext
+ - export CC=gcc-4.8 CXX=g++-4.8
+script:
+ - make
+ - make test
+ - ./test/integration/run-tests -q
+ - sudo adduser --force-badname --system --home /nonexistent --no-create-home --quiet _apt || true
+ - sudo ./test/integration/run-tests -q