travis: enable tests even if libpcap is disabled
authorPeter Wu <peter@lekensteyn.nl>
Fri, 16 Nov 2018 02:09:03 +0000 (03:09 +0100)
committerPeter Wu <peter@lekensteyn.nl>
Fri, 16 Nov 2018 13:55:56 +0000 (13:55 +0000)
Proper dependency tracking has been implemented such that tests that
require dumpcap are skipped when unavailable, let's enable tests again.
Use pytest for nicer traces.

Bug: 14949
Change-Id: I1751bed8bd62e1a69d6e19161f7517735ae96662
Reviewed-on: https://code.wireshark.org/review/30669
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
.travis.yml

index b24fc6b249a61e2ebbcbda5ac8aa3cb75cbd8167..3f2ecf67cb6b33748cf3936f5ce8c846a022548e 100644 (file)
@@ -79,11 +79,14 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/macos-setup-brew.sh; fi
   # linux
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional -qq; fi
-before_script:
   - 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
+before_script:
   - mkdir build
   - cd build
   - cmake -GNinja -DENABLE_PCAP=${PCAP} ..
 script:
   - ninja
-  - if [ "$PCAP" == "ON" ]; then ninja test-programs && ctest -j; fi
+  - ninja test-programs
+  - pytest -nauto -ra -v ../test