Preparations for running on actual server

2 files changed, 9 insertions, 5 deletions

diff --git a/tests/arthur/baselineserver/src/baselineserver.cpp b/tests/arthur/baselineserver/src/baselineserver.cpp
index 86554fd8e8..bef6e412ed 100644
--- a/tests/arthur/baselineserver/src/baselineserver.cpp
+++ b/tests/arthur/baselineserver/src/baselineserver.cpp
@@ -23,9 +23,14 @@ BaselineServer::BaselineServer(QObject *parent)
 QString BaselineServer::storagePath()
 {
     if (storage.isEmpty()) {
-        QDir dir(QCoreApplication::applicationDirPath());
-        dir.cdUp();
-        storage =  dir.path() + QLS("/storage/");
+        QByteArray envDir = qgetenv("QT_LANCELOT_DIR");
+        if (!envDir.isEmpty()) {
+            storage = QLS(envDir.append('/'));
+        } else {
+            QDir dir(QCoreApplication::applicationDirPath());
+            dir.cdUp();
+            storage =  dir.path() + QLS("/storage/");
+        }
     }
     return storage;
 }
diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp
index 78c80f12af..a7fb5be869 100644
--- a/tests/arthur/common/baselineprotocol.cpp
+++ b/tests/arthur/common/baselineprotocol.cpp
@@ -168,10 +168,9 @@ BaselineProtocol::~BaselineProtocol()
 bool BaselineProtocol::connect()
 {
     errMsg.clear();
-    //###TBD: determine server address; for now local devhost
     QByteArray serverName(qgetenv("QT_LANCELOT_SERVER"));
     if (serverName.isNull())
-        serverName = "chimera.europe.nokia.com";
+        serverName = "lancelot.test.qt.nokia.com";
 
     socket.connectToHost(serverName, ServerPort);
     if (!socket.waitForConnected(Timeout)) {