diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-11-16 03:09:03 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2018-11-16 13:55:56 +0000 |
| commit | e2e069e3fa604ca6633199cfd29df4b9f23044e4 (patch) | |
| tree | 6a5a933dd7d25777dde6acd892623b61146cfaeb /.travis.yml | |
| parent | 88ce087dcfc3aaae3d290276333091d324a6fcb9 (diff) | |
travis: enable tests even if libpcap is disabled
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>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index b24fc6b249..3f2ecf67cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 |