aboutsummaryrefslogtreecommitdiffstats
path: root/test/suite-capture.sh
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-04-09 13:19:57 +0800
committerAnders Broman <a.broman58@gmail.com>2018-04-09 08:28:33 +0000
commitfc153057e81381eadede1a0a03d36cc4ecd5293b (patch)
treef3b5c8eea0164ac5cfe80f2f05895b4462bb0e11 /test/suite-capture.sh
parent276d02a62b379f61d397efc2254a0d01d6726225 (diff)
Remove GTK+ tests.
Change-Id: Iba2f9c669c81cfae675ab584ad0250f69aadb987 Reviewed-on: https://code.wireshark.org/review/26819 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'test/suite-capture.sh')
-rwxr-xr-xtest/suite-capture.sh43
1 files changed, 1 insertions, 42 deletions
diff --git a/test/suite-capture.sh b/test/suite-capture.sh
index 383e601804..36a15bc3cb 100755
--- a/test/suite-capture.sh
+++ b/test/suite-capture.sh
@@ -16,7 +16,6 @@ EXIT_COMMAND_LINE=1
EXIT_ERROR=2
WIRESHARK_CMD="$WIRESHARK -o gui.update.enabled:FALSE -k"
-WIRESHARK_GTK_CMD="$WIRESHARK_GTK -o gui.update.enabled:FALSE -k"
PING_PID=
@@ -207,7 +206,7 @@ capture_step_fifo() {
# capture packets via a fifo
capture_step_stdin() {
CONSOLE_LOG_ARGS=""
- if [[ ( "$DUT" == "$WIRESHARK_CMD" || "$DUT" == "$WIRESHARK_GTK_CMD" ) && "$WS_SYSTEM" == "Windows" ]] ; then
+ if [[ "$DUT" == "$WIRESHARK_CMD" && "$WS_SYSTEM" == "Windows" ]] ; then
CONSOLE_LOG_ARGS="-o console.log.level:127"
fi
@@ -445,45 +444,6 @@ wireshark_capture_suite() {
test_step_add "Capture snapshot length 68 bytes (${TRAFFIC_CAPTURE_DURATION}s)" capture_step_snapshot
}
-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.
-
- #
- # NOTE: if, on macOS, we start using a native-Quartz toolkit,
- # this would need to change to check for WS_SYSTEM being
- # "Darwin" and, if it is, check whether the standard output
- # of "launchctl managername" is "Aqua".
- #
- # This may not do the right thing if we use toolkits that
- # use Wayland or Mir directly, unless they also depend on
- # the DISPLAY environment variable.
- #
- if [[ $WS_SYSTEM != Windows ]] && [ -z "$DISPLAY" ]; then
- echo -n ' (X server not available)'
- test_step_skipped
- return
- fi
-
- DUT="$WIRESHARK_GTK_CMD"
- test_step_add "Capture 10 packets" capture_step_10packets
- # piping to stdout doesn't work with Wireshark and capturing!
- #test_step_add "Capture 10 packets using stdout: -w -" capture_step_10packets_stdout
- if [ $TEST_FIFO ]; then
- test_step_add "Capture via fifo" capture_step_fifo
- fi
- test_step_add "Capture via stdin" capture_step_stdin
- # read filter doesn't work with Wireshark and capturing!
- #test_step_add "Capture read filter (${TRAFFIC_CAPTURE_DURATION}s)" capture_step_read_filter
- test_step_add "Capture snapshot length 68 bytes (${TRAFFIC_CAPTURE_DURATION}s)" capture_step_snapshot
-}
-
tshark_capture_suite() {
DUT=$TSHARK
test_step_add "Capture 10 packets" capture_step_10packets
@@ -527,7 +487,6 @@ capture_suite() {
test_suite_add "Dumpcap capture" dumpcap_capture_suite
test_suite_add "TShark capture" tshark_capture_suite
test_suite_add "Wireshark capture" wireshark_capture_suite
- test_suite_add "Wireshark 1 capture" wireshark_gtk_capture_suite
}
#