osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Dario Lombardo 2019-12-17 17:35:31 +01:00
parent 623b347d1e
commit a20fcccda4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/suite_extcaps.py
View File

@ -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):

4
tools/debian-setup.sh
View File

@ -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