diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-08-28 16:48:53 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-02 15:39:17 +0000 |
| commit | b7fb1167e319ed2b1d1fd37f9844b8bc852ccb0d (patch) | |
| tree | 4fe0e3ab63d6a6f4644daa82165ca035dd20cd30 /test/suite-capture.sh | |
| parent | b9e61becffc42f4b2d7981a0f468effbe9fa4b12 (diff) | |
Qt → wireshark. GTK+ → wireshark-gtk.
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".
It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.
Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).
Tested:
- Nmake builds
- NSIS packaging
- CMake builds (Windows, OS X)
- Autotools build and distcheck
- RPM packaging
To do:
- Test Debian packaging
- Fix PortableApps
Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'test/suite-capture.sh')
| -rwxr-xr-x | test/suite-capture.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/suite-capture.sh b/test/suite-capture.sh index b4b0fba926..71dec1a26e 100755 --- a/test/suite-capture.sh +++ b/test/suite-capture.sh @@ -27,7 +27,7 @@ EXIT_OK=0 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" capture_test_output_print() { wait @@ -202,7 +202,7 @@ capture_step_fifo() { # capture packets via a fifo capture_step_stdin() { CONSOLE_LOG_ARGS="" - if [ "$DUT" == "$WIRESHARK_CMD" -a "$WS_SYSTEM" == "Windows" ] ; then + if [ "$DUT" == "$WIRESHARK_GTK_CMD" -a "$WS_SYSTEM" == "Windows" ] ; then CONSOLE_LOG_ARGS="-o console.log.level:127" fi @@ -428,7 +428,7 @@ wireshark_capture_suite() { return fi - DUT="$WIRESHARK_CMD" + 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 |