From abd98ebeaa1b63b1a95630844d681f3f7e22b715 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Mon, 21 Nov 2011 11:07:57 +0100
Subject: [PATCH] Tests: Replace SSH scripting crutch with proper rpath
solution.
Change-Id: Ieae3099d5fe2f69415a86a0e2155d30b699fa3c4
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
tests/manual/ssh/call.sh | 5 -----
tests/manual/ssh/ssh.pri | 10 ++++------
2 files changed, 4 insertions(+), 11 deletions(-)
delete mode 100755 tests/manual/ssh/call.sh
diff --git a/tests/manual/ssh/call.sh b/tests/manual/ssh/call.sh
deleted file mode 100755
index 57073726f8e..00000000000
--- a/tests/manual/ssh/call.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-dir_name=`dirname $0`
-exec=`basename $dir_name`
-LD_LIBRARY_PATH=../../../lib/qtcreator:../../../lib/qtcreator/plugins/Nokia:$LD_LIBRARY_PATH "$dir_name/$exec" "$@"
diff --git a/tests/manual/ssh/ssh.pri b/tests/manual/ssh/ssh.pri
index c7ee1bad022..8a8bb6a95be 100644
--- a/tests/manual/ssh/ssh.pri
+++ b/tests/manual/ssh/ssh.pri
@@ -6,6 +6,10 @@ LIBS += -L$$IDE_PLUGIN_PATH/Nokia
macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\"
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins
LIBS *= -L$$IDE_LIBRARY_PATH/Nokia
+unix {
+ QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_PLUGIN_PATH/..\"
+ QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_PLUGIN_PATH/Nokia\"
+}
QT += core
QT -= gui
@@ -15,9 +19,3 @@ TEMPLATE = app
DEPENDPATH+=.
INCLUDEPATH+=.
-
-unix {
- copy_script.commands = cp -a $${PWD}/call.sh $$OUT_PWD/$${TARGET}.sh
- first.depends = $(first) copy_script
- QMAKE_EXTRA_TARGETS += first copy_script
-}
--
GitLab