Remove GTK+ tests.
authorGerald Combs <gerald@wireshark.org>
Mon, 9 Apr 2018 05:19:57 +0000 (13:19 +0800)
committerAnders Broman <a.broman58@gmail.com>
Mon, 9 Apr 2018 08:28:33 +0000 (08:28 +0000)
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>
test/config.sh
test/suite-capture.sh

index 4280905e869101d0490413c84f0931739a4b273f..eb06a3539c5c772af42a6a325d3f1fa901101cdf 100755 (executable)
@@ -41,18 +41,14 @@ SKIP_CAPTURE=${SKIP_CAPTURE:-1}
 
 # Override the last two items if we're running Windows
 if [ "$WS_SYSTEM" = "Windows" ] ; then
-       WS_BIN_PATH=${WS_BIN_PATH:-$SOURCE_DIR/wireshark-gtk2}
-       WS_QT_BIN_PATH=${WS_QT_BIN_PATH:-$SOURCE_DIR/wireshark-qt-release}
        SKIP_CAPTURE=0
 fi
 
 # Path to the Wireshark binaries, default to source dir if unset
 WS_BIN_PATH=${WS_BIN_PATH:-$SOURCE_DIR}
-WS_QT_BIN_PATH=${WS_QT_BIN_PATH:-$WS_BIN_PATH}
 
 # Tweak the following to your liking.
-WIRESHARK=$WS_QT_BIN_PATH/wireshark
-WIRESHARK_GTK=$WS_BIN_PATH/wireshark-gtk
+WIRESHARK=$WS_BIN_PATH/wireshark
 TSHARK=$WS_BIN_PATH/tshark
 RAWSHARK=$WS_BIN_PATH/rawshark
 CAPINFOS=$WS_BIN_PATH/capinfos
index 383e601804826b12891027e7b3126594e6b7e816..36a15bc3cb315a9d93812682cfc86f43e4f85cc0 100755 (executable)
@@ -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
 }
 
 #