Ensure tests work in cmake Multi-Config

There are several tests that search for an executable to run.  In Multi-
Config, where different builds are put in subfolders, the searches would
fail.

Change-Id: I04100a39a8b05be7c28732a64605b302ff215e5d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Michael Brasser <michael.brasser@live.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp
index a110dd7..3397e37 100644
--- a/tests/auto/integration/tst_integration.cpp
+++ b/tests/auto/integration/tst_integration.cpp
@@ -220,6 +220,7 @@ private slots:
 
     void initTestCase()
     {
+        QVERIFY(TestUtils::init("integration"));
         QLoggingCategory::setFilterRules("qt.remoteobjects.warning=false");
 
         // use different paths in QRemoteObjectSettingsStore
@@ -1331,9 +1332,7 @@ private slots:
         QFETCH_GLOBAL(QUrl, hostUrl);
         if (hostUrl.scheme() != QRemoteObjectStringLiterals::local())
             QSKIP("Skipping 'local' specific backend for non-local test.");
-        const auto progName = TestUtils::findExecutable("localsockettestserver", {
-            QCoreApplication::applicationDirPath() + "/../localsockettestserver"
-        });
+        const auto progName = TestUtils::findExecutable("localsockettestserver", "/localsockettestserver");
 
         //create a fake socket as killing doesn't produce a necessarily unusable socket
         QFile fake(QDir::temp().absoluteFilePath(QStringLiteral("crashMe")));
@@ -1365,9 +1364,7 @@ private slots:
         QFETCH_GLOBAL(QUrl, hostUrl);
         if (hostUrl.scheme() != QRemoteObjectStringLiterals::local())
             QSKIP("Skipping 'local' specific backend for non-local test.");
-        const auto progName = TestUtils::findExecutable("localsockettestserver", {
-            QCoreApplication::applicationDirPath() + "/../localsockettestserver"
-        });
+        const auto progName = TestUtils::findExecutable("localsockettestserver", "/localsockettestserver");
 
         QProcess testServer;
         testServer.start(progName, QStringList());