diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2022-02-11 16:38:56 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2022-02-14 10:01:04 +0000 |
| commit | b82bb5218386e4c8a48a308ca6ae8af28ce0de8b (patch) | |
| tree | 497070eab1003fb5d323b5eb935c5f5c0531ce08 /tests/manual/ssh | |
| parent | 30847a96848b91bb2ab58dba71f0b341910ac4d1 (diff) | |
| download | qt-creator-b82bb5218386e4c8a48a308ca6ae8af28ce0de8b.tar.gz | |
Tests: Fix launcherinterface location
Change-Id: I0802d6e26938528635094bc928f55b8a285c1639
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/manual/ssh')
| -rw-r--r-- | tests/manual/ssh/shell/main.cpp | 3 | ||||
| -rw-r--r-- | tests/manual/ssh/shell/shell.qbs | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tests/manual/ssh/shell/main.cpp b/tests/manual/ssh/shell/main.cpp index 21010b8ea5..c47471ae7d 100644 --- a/tests/manual/ssh/shell/main.cpp +++ b/tests/manual/ssh/shell/main.cpp @@ -27,6 +27,7 @@ #include "shell.h" #include <ssh/sshconnection.h> +#include <utils/launcherinterface.h> #include <utils/temporarydirectory.h> #include <QCoreApplication> @@ -40,6 +41,8 @@ int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); + Utils::LauncherInterface::setPathToLauncher(qApp->applicationDirPath() + '/' + + QLatin1String(TEST_RELATIVE_LIBEXEC_PATH)); bool parseSuccess; const QSsh::SshConnectionParameters ¶meters = ArgumentsCollector(app.arguments()).collect(parseSuccess); diff --git a/tests/manual/ssh/shell/shell.qbs b/tests/manual/ssh/shell/shell.qbs index e2308fc7d0..f8cc41a022 100644 --- a/tests/manual/ssh/shell/shell.qbs +++ b/tests/manual/ssh/shell/shell.qbs @@ -1,4 +1,5 @@ import qbs +import qbs.FileInfo QtcManualtest { name: "Manual ssh shell test" @@ -7,6 +8,15 @@ QtcManualtest { Depends { name: "QtcSsh" } Depends { name: "Qt.network" } + cpp.defines: { + var defines = base; + var absLibExecPath = FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix, + qtc.ide_libexec_path); + var relLibExecPath = FileInfo.relativePath(destinationDirectory, absLibExecPath); + defines.push('TEST_RELATIVE_LIBEXEC_PATH="' + relLibExecPath + '"'); + return defines; + } + files: [ "argumentscollector.cpp", "argumentscollector.h", |