TagFile: Fix off-by-one errors in comment stripping

[apt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 392a2f3eae864f14c82277d90950c300b2b8aeac..131bf4abd43370bcaf416a8c2c55238df7bff6a3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,23 @@
 language: cpp
+sudo: required
+dist: trusty
 before_install:
+ - 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
- - sudo apt-get install -qq dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml
-script: test/integration/run-tests
+install:
+ - sudo apt-get -qq -y -t wily install gettext liblz4-dev python3-apt
+ - sudo apt-get -qq -y -t xenial install cmake
+ - sudo ./prepare-release travis-ci
+before_script:
+ - ( mkdir build && cd build && cmake .. )
+ - make -C build -j4
+script:
+ - CTEST_OUTPUT_ON_FAILURE=1 make -C build test
+ - chronic make -C build install DESTDIR=$PWD/rootdir
+ - ./test/integration/run-tests -qq
+ - sudo adduser --force-badname --system --home /nonexistent --no-create-home --quiet _apt || true
+ - sudo ./test/integration/run-tests -qq