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>

4 files changed, 8 insertions, 8 deletions

diff --git a/test/config.sh b/test/config.sh
index 693a6c12a0..a33cbd9e4f 100755
--- a/test/config.sh
+++ b/test/config.sh
@@ -57,7 +57,7 @@ fi
 WS_BIN_PATH=${WS_BIN_PATH:-$SOURCE_DIR}
 
 # Tweak the following to your liking.
-WIRESHARK=$WS_BIN_PATH/wireshark
+WIRESHARK_GTK=$WS_BIN_PATH/wireshark-gtk
 TSHARK=$WS_BIN_PATH/tshark
 RAWSHARK=$WS_BIN_PATH/rawshark
 CAPINFOS=$WS_BIN_PATH/capinfos
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
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
 }
diff --git a/test/test.sh b/test/test.sh
index 6ed3f0e3a3..a676b1f122 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -114,7 +114,7 @@ trap test_cleanup EXIT
 test_step_prerequisites() {
 
 	NOTFOUND=0
-	for i in "$WIRESHARK" "$TSHARK" "$CAPINFOS" "$DUMPCAP" ; do
+	for i in "$WIRESHARK_GTK" "$TSHARK" "$CAPINFOS" "$DUMPCAP" ; do
 		if [ ! -x $i ]; then
 			echo "Couldn't find $i"
 			NOTFOUND=1