diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-10-01 12:44:14 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-10-01 22:30:33 +0000 |
| commit | 58cde5c74accbb7ad843e4b97e64c2b9f74b8854 (patch) | |
| tree | 52808e0e80d4c7c7621960d392f4dc0b1e049464 /test/config.sh | |
| parent | b5aa0d2a4f6b70c16323e5ea69412c3cc861379e (diff) | |
Add tests for the Qt UI.
Make sure the Qt UI quits if WIRESHARK_QUIT_AFTER_CAPTURE is set. Make
sure Bourne shell scripts (*.sh) have UNIX/POSIX line endings. Reduce
some time values so that the tests run faster.
Change-Id: I81df7c6f72d7d807d1856863cbea1bb6326ca711
Reviewed-on: https://code.wireshark.org/review/4407
Tested-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'test/config.sh')
| -rwxr-xr-x | test/config.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/config.sh b/test/config.sh index a33cbd9e4f..e7306668eb 100755 --- a/test/config.sh +++ b/test/config.sh @@ -50,13 +50,16 @@ 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:-$SOURCE_DIR} # Tweak the following to your liking. +WIRESHARK=$WS_QT_BIN_PATH/wireshark WIRESHARK_GTK=$WS_BIN_PATH/wireshark-gtk TSHARK=$WS_BIN_PATH/tshark RAWSHARK=$WS_BIN_PATH/rawshark @@ -76,7 +79,7 @@ TRAFFIC_CAPTURE_IFACE=${TRAFFIC_CAPTURE_IFACE:-1} # time to capture some traffic (in seconds) # (you may increase this if you get errors caused by very low traffic) -TRAFFIC_CAPTURE_DURATION=15 +TRAFFIC_CAPTURE_DURATION=10 # the default is to not capture in promiscuous mode # (this makes known trouble with some Windows WLAN adapters) |