diff options
| author | Dario Lombardo <lomato@gmail.com> | 2019-12-17 17:35:31 +0100 |
|---|---|---|
| committer | Dario Lombardo <lomato@gmail.com> | 2019-12-19 08:02:37 +0000 |
| commit | a20fcccda49172fcb140a96707ff81a155ebd911 (patch) | |
| tree | f4a3b2431997bf02a4607e506b34e00234f16275 | |
| parent | 623b347d1e863f7cd2d331926106321d3182d169 (diff) | |
test: fix CI builds on linux.
Fixes:
- sdjournal is available on linux only.
- The systemd library has been put in the right group in debian-setup.
Change-Id: Ie022f29da4313d17d55201b6e7ea1ab2ae740e18
Reviewed-on: https://code.wireshark.org/review/35478
Reviewed-by: Dario Lombardo <lomato@gmail.com>
| -rw-r--r-- | test/suite_extcaps.py | 4 | ||||
| -rwxr-xr-x | tools/debian-setup.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/suite_extcaps.py b/test/suite_extcaps.py index 64b0e833c5..a5b5ddf5b0 100644 --- a/test/suite_extcaps.py +++ b/test/suite_extcaps.py @@ -75,8 +75,8 @@ class case_extcaps(subprocesstest.SubprocessTestCase): def test_sdjournal(self, check_extcap_execution): ''' extcap interface tests for sdjournal ''' - if sys.platform == 'win32': - fixtures.skip('sdjournal not available on Windows') + if not sys.platform.startswith('linux'): + fixtures.skip('sdjournal available on Linux only') check_extcap_execution("sdjournal") def test_sshdump(self, check_extcap_execution): diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 140d252469..ea86c29754 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -151,8 +151,8 @@ echo "libbrotli-dev is unavailable" >&2 # libsystemd-journal-dev: Ubuntu 14.04 # libsystemd-dev: Ubuntu >= 16.04 -add_package DEBDEPS_LIST libsystemd-dev || -add_package DEBDEPS_LIST libsystemd-journal-dev || +add_package ADDITIONAL_LIST libsystemd-dev || +add_package ADDITIONAL_LIST libsystemd-journal-dev || echo "libsystemd-dev is unavailable" # softhsm2 2.0.0: Ubuntu 16.04 |