diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-04-19 09:26:00 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-04-19 08:01:27 +0000 |
| commit | aae825cf7757b5fc2690f3ad95344c3d042b982b (patch) | |
| tree | 2a835e1d3cb72f858dd345c9db574c320da4341e | |
| parent | 735cfc8502e6dac8edfeb729e8c912ed897cb08b (diff) | |
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>
| -rw-r--r-- | cmake/modules/GenerateTestSh.cmake | 4 | ||||
| -rwxr-xr-x | test/test.sh | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cmake/modules/GenerateTestSh.cmake b/cmake/modules/GenerateTestSh.cmake index 3946ead4f9..6a7637b736 100644 --- 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 8aa4069da5..1dafe8df68 100755 --- 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 |