Merge branch 'cmake'

[apt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b413134c5b345e2da36cd7856381b7664c571cdc..3c4b5931908c55c460901a89ba21a223d29bf146 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,24 @@
 language: cpp
+sudo: required
+dist: trusty
 before_install:
- - sudo apt-get update -q
+ - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' -y
+ - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main' -y
+ - |
+   sudo sh -c '/bin/echo -e "Package: *\nPin: release n=wily\nPin-Priority: 1" > /etc/apt/preferences.d/wily'
+   sudo sh -c '/bin/echo -e "Package: *\nPin: release n=xenial\nPin-Priority: 1" > /etc/apt/preferences.d/xenial'
+ - 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 -t wily install gettext liblz4-dev python3-apt
+ - sudo apt-get -qq -y -t xenial install cmake
+before_script:
+ - ( mkdir build && cd build && cmake .. )
+ - make -C build -j4
+script:
+ - make -C build 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
+ - make -C build install DESTDIR=$PWD/rootdir
+ - find rootdir -print0 | xargs -0 ls -ld