diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-10-20 23:33:48 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-10-21 20:38:46 +0000 |
| commit | 7f6a4926d2f6a135960146041c29802db616aa63 (patch) | |
| tree | c758bdbd80e0984b8dd5e760aa01f65754e4442a /test | |
| parent | 10a1e8d261d30ce30300c6f51863b74184e61bd5 (diff) | |
| download | wireshark-7f6a4926d2f6a135960146041c29802db616aa63.tar.gz wireshark-7f6a4926d2f6a135960146041c29802db616aa63.tar.bz2 wireshark-7f6a4926d2f6a135960146041c29802db616aa63.zip | |
test: make GTK support optional
Current Ubuntu buildbot is failing because GTK support was removed.
Tests should not fail if GTK is not available, so make it optional.
Change-Id: I1640c8bcea5208299f6846eb366e105c39a3ebf3
Reviewed-on: https://code.wireshark.org/review/18345
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/suite-capture.sh | 6 | ||||
| -rwxr-xr-x | test/suite-io.sh | 7 | ||||
| -rwxr-xr-x | test/test.sh | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/test/suite-capture.sh b/test/suite-capture.sh index af02d6eefb..3b0c685e9e 100755 --- a/test/suite-capture.sh +++ b/test/suite-capture.sh @@ -458,6 +458,12 @@ wireshark_capture_suite() { } wireshark_gtk_capture_suite() { + if [ ! -x "$WIRESHARK_GTK" ]; then + echo -n ' (no GTK support)' + test_step_skipped + return + fi + # k: start capture immediately # WIRESHARK_QUIT_AFTER_CAPTURE needs to be set. diff --git a/test/suite-io.sh b/test/suite-io.sh index 22941c08f2..068eb81b1e 100755 --- a/test/suite-io.sh +++ b/test/suite-io.sh @@ -149,12 +149,6 @@ wireshark_io_suite() { test_step_add "Input file" io_step_input_file } -wireshark_gtk_io_suite() { - # Q: quit after cap, k: start capture immediately - DUT="$WIRESHARK_GTK" - test_step_add "Input file" io_step_input_file -} - tshark_io_suite() { DUT=$TSHARK test_step_add "Input file" io_step_input_file @@ -185,7 +179,6 @@ io_suite() { test_step_set_pre io_cleanup_step test_step_set_post io_cleanup_step test_suite_add "TShark file I/O" tshark_io_suite - #test_suite_add "Wireshark file I/O" wireshark_gtk_io_suite #test_suite_add "Dumpcap file I/O" dumpcap_io_suite test_suite_add "Rawshark file I/O" rawshark_io_suite } diff --git a/test/test.sh b/test/test.sh index d4fcc762ff..d469eccc22 100755 --- a/test/test.sh +++ b/test/test.sh @@ -128,7 +128,7 @@ trap test_cleanup EXIT test_step_prerequisites() { NOTFOUND=0 - for i in "$WIRESHARK" "$WIRESHARK_GTK" "$TSHARK" "$CAPINFOS" "$MERGECAP" "$DUMPCAP" ; do + for i in "$WIRESHARK" "$TSHARK" "$CAPINFOS" "$MERGECAP" "$DUMPCAP" ; do if [ ! -x $i ]; then echo "Couldn't find $i" NOTFOUND=1 |