Commit Graph

33 Commits

Author SHA1 Message Date
Peter Wu 0a25bfe647 test: enable parallelism by default for pytest
Consistent with tools like "ninja", enable parallelism by default. It
can be disabled again with `pytest -n0`.

This makes pytest-xdist a dependency when pytest is used as test runner.
This does not affect the unittest-based test runnet (test/test.py).

Change-Id: I4dc905f097c57a869aa39487b15361502b431616
Reviewed-on: https://code.wireshark.org/review/31371
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-05 06:47:25 +00:00
Peter Wu 2e411dba93 test: allow running pytest without specifying the tests directory
This allows `pytest` to be executed from the top-level source or build
directory (or any other directory below).

Change-Id: Ib7af2ea2aaf01319d6839d2dc67228fbb5a7bc34
Reviewed-on: https://code.wireshark.org/review/31370
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-05 06:46:54 +00:00
Peter Wu ac58eafa32 Add support for RSA decryption using PKCS #11 tokens
Add support for loading RSA private key files from PKCS #11 tokens,
identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can
dynamically load PKCS #11 provider libraries that are not found by
p11-kit.

The configuration GUI will need additional code to discover available
PKCS #11 tokens and will be added later.

This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows,
macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7.
Currently macOS via official packages disables PKCS #11 support, so that
will also not work.

Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66
Reviewed-on: https://code.wireshark.org/review/30855
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-29 10:40:16 +00:00
Peter Wu b8a4843db5 test: enable extra test summary by default
This reports the reason why tests are skipped (for example, if a certain
binary was not built).

Change-Id: I19095f43f69228116d71b52380814a61894754af
Reviewed-on: https://code.wireshark.org/review/31131
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-19 21:51:06 +00:00
Peter Wu 3ee5747481 travis,appveyor: display tshark --version output
This reveals the actual build configuration.

Change-Id: Ie49cea4a07faaa1b942ff6a973b03893f36ca16f
Reviewed-on: https://code.wireshark.org/review/31043
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 14:11:25 +00:00
Peter Wu a33d4ccb06 travis: upgrade to Xenial
Travis now supports Ubuntu 16.04 (Xenial):
https://blog.travis-ci.com/2018-11-08-xenial-release

Simplify the environment:
- Clang 7 is default, https://docs.travis-ci.com/user/languages/c/
  (ubuntu-toolchain-r-test is still needed because GCC 5.4 is default)
- libnghttp2-dev, libssh-gcrypt-dev and libmaxminddb-dev are available.
  (No longer requires ppa:wireshark-dev/stable)

Upgrading to Xenial will also enable Libgcrypt 1.6 tests and includes
GnuTLS 3.4.10 which will be useful for future PKCS #11 tests.
Gitlab's rpm-centos-7 still covers Libgcrypt 1.5.3 and GnuTLS 3.3.29.
Coverage will be lost for GnuTLS 3.2.11 (Ubuntu 14.04, Trusty).

Change-Id: Ic28bf23707c75b2c97bedad66206e9c1f129164c
Reviewed-on: https://code.wireshark.org/review/31039
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 14:11:15 +00:00
Peter Wu 2f79bf42b6 travis: increase verbosity with apt logging
Show the packages that are about to be installed.

Change-Id: Ifef21ae852075c5eb672bc0ca7b360f5b438283a
Reviewed-on: https://code.wireshark.org/review/30841
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-30 01:12:56 +00:00
Peter Wu e2e069e3fa 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>
2018-11-16 13:55:56 +00:00
Dario Lombardo b310a25dba travis: fully restyle the matrix.
It includes the following builds:
- osx default pcap on/off
- osx xcode 10.1 pcap on/off
- linux gcc-8 pcap on/off
- linux clang-7 pcap on/off

Doc: https://docs.travis-ci.com/user/languages/cpp/

Change-Id: I21e20f3678d35d19756cb1ce1a7b97624f18c3e3
Reviewed-on: https://code.wireshark.org/review/30493
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-11-05 18:12:41 +00:00
Dario Lombardo 348333a100 travis: use ctest directly (allows parallel execution).
Change-Id: I74b2eb852ab2bac6b5151916c8f5fa52f7f7de49
Reviewed-on: https://code.wireshark.org/review/30506
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-11-04 13:28:59 +00:00
Dario Lombardo 983390105f travis: fix indentation.
Change-Id: I5c69218d590d210d61b18c4dc6b7322b9a9ee2b1
Reviewed-on: https://code.wireshark.org/review/30489
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-11-03 09:43:09 +00:00
Dario Lombardo 7e000c9661 travis: fix typo.
Change-Id: Id5613fd9aa506d62e7a48585d6ea13c3db100068
Reviewed-on: https://code.wireshark.org/review/28650
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-06 14:30:51 +00:00
Peter Wu c1e5733a28 travis: remove unnecessary qt5 in PATH for macOS
Since v2.5.0rc0-1101-ged15895221 ("cmake: look for Qt5 from Homebrew on
macOS"), qt5 no longer needs to be in the PATH.

Change-Id: I1edadcb0eec8a38c4f7364353e57f92c80ca400f
Reviewed-on: https://code.wireshark.org/review/28352
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-20 21:46:18 +00:00
Dario Lombardo 14456d0de8 travis: fix gem command line.
Change-Id: I84bc07edad1453b2e41311f21eb37454898a8fd5
Reviewed-on: https://code.wireshark.org/review/28018
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-06-05 06:57:09 +00:00
Dario Lombardo 70e49e8e13 travis: don't install asciidoctor's documentation.
Change-Id: I8d70cb7e940dc527c13e60195f4fd049cdff2481
Reviewed-on: https://code.wireshark.org/review/27954
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-06-04 16:48:16 +00:00
Dario Lombardo 8beb669b32 travis: add regression tests to pcap builds.
Change-Id: Ibdd3f5bfc7ed0e6a75c83227d50d6e00dccf6814
Reviewed-on: https://code.wireshark.org/review/27619
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-18 09:13:29 +00:00
Dario Lombardo 39586110d8 travis: add wireshark/stable ppa.
This is required for missing trusty packages (as nghttp2).

Change-Id: Ibff9f89c3a89c7e4593650384f97a23f05f899f3
Reviewed-on: https://code.wireshark.org/review/27576
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18 04:11:17 +00:00
Dario Lombardo cb9b889d40 travis: remove duplicate line.
Change-Id: I39c3aa14b9d4b7dbe78a1be697aa67bf4609dbc5
Reviewed-on: https://code.wireshark.org/review/27578
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-16 15:04:21 +00:00
Dario Lombardo 0c8c714e9e travis: enable apt update.
Change-Id: I102b669238dcbf3b8fce8b7429da08f471a20811
Reviewed-on: https://code.wireshark.org/review/27575
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-16 15:02:04 +00:00
Alexis La Goutte 84c200af93 travis: update to gcc-8 and clang-5
Change-Id: I538f87253241ce3b399bf638514df73447622219
Reviewed-on: https://code.wireshark.org/review/27337
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-05 16:19:01 +00:00
Dario Lombardo 12613415ef travis: use ninja for building.
Change-Id: I18cf4c79e6073955d8224c7a37f906ec54a8edbc
Reviewed-on: https://code.wireshark.org/review/27324
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-04 08:30:07 +00:00
Dario Lombardo 4a156da068 Remove autotools build system.
It has been replaced by cmake.

Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a
Reviewed-on: https://code.wireshark.org/review/26969
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-18 03:46:17 +00:00
Dario Lombardo 6c00182e1a travis: add asciidoctor.
Change-Id: I82e72bf194c37001190868257fb7bef499e38ede
Reviewed-on: https://code.wireshark.org/review/25789
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-02-14 13:41:20 +00:00
Dario Lombardo e80b40adbe extcap: remove conditional compilation.
Change-Id: Ia54bba388755cf27a343fe6d69d244bf1ab897f9
Reviewed-on: https://code.wireshark.org/review/25186
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-08 05:50:15 +00:00
Alexis La Goutte 05b028abde travis: fix build with osx (macOS)
Like say on -dev mailing https://www.wireshark.org/lists/wireshark-dev/201706/msg00113.html
and also recommanded when install Qt via homebrew (brew install qt)

[...]
If you need to have this software first in your PATH instead consider running:

  echo 'export PATH="/usr/local/opt/qt/bin:$PATH"' >> ~/.bash_profile

Fix following cmake error :

- Found python module asn2wrs: /Users/travis/build/alagoutte/wireshark/tools/asn2wrs.py

CMake Error at /usr/local/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:15 (message):

  The imported target "Qt5::Core" references the file

     "/usr/local/.//mkspecs/macx-clang"

  but this file does not exist.  Possible reasons include:

  * The file was deleted, renamed, or moved to another location.

  * An install or uninstall procedure did not complete successfully.

  * The installation package was faulty and contained

     "/usr/local/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake"

  but not all the files it references.

Change-Id: I47137109c6ddb30de653e424d9baef4a340faad3
Reviewed-on: https://code.wireshark.org/review/22512
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-05 19:14:44 +00:00
Dario Lombardo 67385b184c travis: improve test matrix.
Details:
- remove the original broken environments and create multi-variable ones
- remove old comments
- exclude some OSX builds

Change-Id: Iec98d13350444678823fa52bb3b9faefe02859d6
Reviewed-on: https://code.wireshark.org/review/18689
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-14 17:56:21 +00:00
Dario Lombardo 315c5f0814 travis: remove matrix steps from osx
Change-Id: I172854246fea1858a622178177ca1524f7b4946f
Reviewed-on: https://code.wireshark.org/review/18671
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-05 09:11:29 +00:00
Dario Lombardo d143598c56 travis: move osx first.
Change-Id: I08f65a6b5bcc78c4a74ed9f1488bca07cc6a1fd5
Reviewed-on: https://code.wireshark.org/review/18670
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-05 09:10:45 +00:00
Gerald Combs d3995b5248 Disable GTK+ by default.
I suggested disabling GTK+ by default at Sharkfest EU and no one
objected, hence this patch.

Disable it by default in both Autotools and CMake. Make sure it's
enabled for Debian packaging. The RPM packaging enables GTK3 explicitly
so no change appears to be necessary there.

Change-Id: If5daeaef4bb26cf60006bc8883be15b2cf6c6ae4
Reviewed-on: https://code.wireshark.org/review/18256
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-19 20:35:31 +00:00
Alexis La Goutte 6e44ea3f98 Add osx/macos build for Travis CI
Change-Id: Id6beedfbe909ac3639790cbb7471bd968bed5b82
Reviewed-on: https://code.wireshark.org/review/16496
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-17 13:43:49 +00:00
Alexis La Goutte dbcabe87af Use debian tools script for travis
Change-Id: I0e3390048fe2723579cc108f5adf582f570a41e5
Reviewed-on: https://code.wireshark.org/review/16494
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-07-16 14:52:12 +00:00
Alexis La Goutte 2831d391ef Update Travis to Trusty
It is now possible to have Trusty Ubuntu image when using Travis (Github)
http://blog.travis-ci.com/2015-10-14-opening-up-ubuntu-trusty-beta/

Move to Trusty (and GTK3/Qt5)

Change-Id: I54cbd4936dd9d8fbd8fe9fb1538290045ec0d5af
Reviewed-on: https://code.wireshark.org/review/11115
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-27 23:57:04 +00:00
Alexis La Goutte 801824b8a7 Add .travis.yml for Travis CI (for Github user...)
4 jobs
* autotools / gcc
* autotools / clang
* cmake / gcc
* cmake / clang

Change-Id: Ifc5b079415232b77680c87b2dee441566e08c835
Reviewed-on: https://code.wireshark.org/review/3944
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-20 19:39:50 +00:00