Remove remnants of WS_QT_BIN_PATH

Change-Id: If1152b285df143dd7cf75abf9ecbc2d0251306df
Reviewed-on: https://code.wireshark.org/review/27021
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

diff --git a/cmake/modules/GenerateTestSh.cmake b/cmake/modules/GenerateTestSh.cmake
index 3946ead4f9e326108b73edfce76fa127617a2a54..6a7637b736c3120e95e8a1d3044b8ad84169dce3 100644 (file)
--- a/cmake/modules/GenerateTestSh.cmake
+++ b/cmake/modules/GenerateTestSh.cmake
@@ -33,11 +33,9 @@ endif()
 file(APPEND ${TEST_SH_OUTPUT} "# Exec wrapper for ${TEST_SH_EXEC}\n")
 file(APPEND ${TEST_SH_OUTPUT} "WS_BIN_PATH=${TEST_SH_BIN_DIR}\n")
 file(APPEND ${TEST_SH_OUTPUT} "export WS_BIN_PATH\n")
-file(APPEND ${TEST_SH_OUTPUT} "WS_QT_BIN_PATH=${TEST_SH_BIN_DIR}\n")
-file(APPEND ${TEST_SH_OUTPUT} "export WS_QT_BIN_PATH\n")
 file(APPEND ${TEST_SH_OUTPUT} "cd ${TEST_SH_SRC_DIR}\n")
 file(APPEND ${TEST_SH_OUTPUT} "exec ${TEST_SH_EXEC} \"$@\"\n")
 
 execute_process(COMMAND chmod a+x ${TEST_SH_OUTPUT})
 
-message(STATUS "Generated ${TEST_SH_OUTPUT}")
\ No newline at end of file
+message(STATUS "Generated ${TEST_SH_OUTPUT}")

diff --git a/test/test.sh b/test/test.sh
index 8aa4069da58edd4a32a7d33f8c99d84f2e06bfd7..1dafe8df68090498f6d1c8150594ad2337908f0a 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -59,7 +59,6 @@ MYDIR=$(dirname $0)
 if [ -d run ]; then
        if [ -e run/tshark -o -e run/dumpcap -o -e run/rawshark ]; then
                WS_BIN_PATH=${WS_BIN_PATH:-$(cd run && pwd)}
-               WS_QT_BIN_PATH=${WS_QT_BIN_PATH:-$WS_BIN_PATH}
        fi
 fi
 source $MYDIR/test-backend.sh