X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=.travis.yml;h=ed47fbd7d0bb0249423854b54eb32c8af878c901;hp=3f2ecf67cb6b33748cf3936f5ce8c846a022548e;hb=a4dad7cb6dab626887c252ac74a21b8a942ec2d0;hpb=e2e069e3fa604ca6633199cfd29df4b9f23044e4

diff --git a/.travis.yml b/.travis.yml
index 3f2ecf67cb..ed47fbd7d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: minimal
 sudo: required
-dist: trusty
+dist: xenial
 matrix:
   include:
     - name: OSX (clang-9) with PCAP
@@ -26,7 +26,6 @@ matrix:
           update: true
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:wireshark-dev/stable'
           packages: g++-8
       env:
         - CXX=g++-8
@@ -39,46 +38,30 @@ matrix:
           update: true
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:wireshark-dev/stable'
           packages: g++-8
       env:
         - CXX=g++-8
         - CC=gcc-8
         - PCAP=OFF
-    - name: Linux (clang-7) with PCAP
+    - name: Linux (clang) with PCAP
       os: linux
-      addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-7
-            - sourceline: 'ppa:wireshark-dev/stable'
-          packages: clang-7
       env:
-        - CXX=clang++-7
-        - CC=clang-7
+        - CXX=clang++
+        - CC=clang
         - PCAP=ON
-    - name: Linux (clang-7) without PCAP
+    - name: Linux (clang) without PCAP
       os: linux
-      addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-7
-            - sourceline: 'ppa:wireshark-dev/stable'
-          packages: clang-7
       env:
-        - CXX=clang++-7
-        - CC=clang-7
+        - CXX=clang++
+        - CC=clang
         - PCAP=OFF
 before_install:
   - echo $TRAVIS_OS_NAME
   # macos
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/macos-setup-brew.sh; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install softhsm; fi
   # linux
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional -qq; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional --install-test-deps -q; fi
   - sudo gem install asciidoctor --no-ri --no-rdoc
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y python3-pip; fi
   - sudo pip3 install pytest pytest-xdist
@@ -89,4 +72,6 @@ before_script:
 script:
   - ninja
   - ninja test-programs
-  - pytest -nauto -ra -v ../test
+  - pytest -nauto -v ../test
+after_script:
+  - if [ -f run/tshark ]; then run/tshark --version; fi