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>

1 files changed, 3 insertions, 3 deletions

diff --git a/test/suite-io.sh b/test/suite-io.sh
index c8f471b106..3245a61edb 100755
--- a/test/suite-io.sh
+++ b/test/suite-io.sh
@@ -143,9 +143,9 @@ io_step_rawshark_pcap_stdin() {
 }
 
 
-wireshark_io_suite() {
+wireshark_gtk_io_suite() {
 	# Q: quit after cap, k: start capture immediately
-	DUT="$WIRESHARK"
+	DUT="$WIRESHARK_GTK"
 	test_step_add "Input file" io_step_input_file
 }
 
@@ -179,7 +179,7 @@ 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_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
 }