The unit test modifies the PATH.

It was already doing this for Mac builds. Do it for all Unix builds now.
This way, we don't need a special code path, enabled for the CI system,
that allows tests to pass there that then fail on regular desktops.

Change-Id: I8b0bc61339a3d615c2703e7692927e03f5457101
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>

2 files changed, 1 insertions, 18 deletions

diff --git a/src/serviceframework/ipc/qremoteserviceregister_ls_p.cpp b/src/serviceframework/ipc/qremoteserviceregister_ls_p.cpp
index 2ffc9d43..13754fdc 100644
--- a/src/serviceframework/ipc/qremoteserviceregister_ls_p.cpp
+++ b/src/serviceframework/ipc/qremoteserviceregister_ls_p.cpp
@@ -316,13 +316,7 @@ QObject* QRemoteServiceRegisterPrivate::proxyForService(const QRemoteServiceRegi
         if (!socket->isValid()) {
             QString path = location;
             qWarning() << "Cannot connect to remote service, trying to start service " << path;
-            // If we have autotests enable, check for the service in .
-#ifdef QT_BUILD_INTERNAL
-            QFile file(QStringLiteral("./") + path);
-            if (file.exists()){
-                path.prepend(QStringLiteral("./"));
-            }
-#endif /* QT_BUILD_INTERNAL */
+
             qint64 pid = 0;
             // Start the service as a detached process
             if (QProcess::startDetached(path, QStringList(), QString(), &pid)){
diff --git a/src/serviceframework/ipc/qremoteserviceregister_unix_p.cpp b/src/serviceframework/ipc/qremoteserviceregister_unix_p.cpp
index 86a7ceca..762b643b 100644
--- a/src/serviceframework/ipc/qremoteserviceregister_unix_p.cpp
+++ b/src/serviceframework/ipc/qremoteserviceregister_unix_p.cpp
@@ -982,17 +982,6 @@ int doStart(const QString &location) {
                << "SFW unable to connect to service, trying to start it." << ret << qt_error_string(errno);
 
     QString path = location;
-    // If we have autotests enable, check for the service in .
-#ifdef QT_BUILD_INTERNAL
-    QFile filei(QStringLiteral("./") + path);
-    if (filei.exists()){
-        path.prepend(QStringLiteral("./"));
-        qServiceLog() << "class" << "doStart"
-                      << "event" << "found daemon in ."
-                      << "location" << path;
-    }
-#endif /* QT_BUILD_INTERNAL */
-
 
     int pipefd[2];