diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-17 20:31:38 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:38 +0100 |
commit | e88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch) | |
tree | c5b05d45e49194d70ff4defae41e5d5d5cf75e80 /tests/baselineserver | |
parent | 2df8884bc68343ad96962e7496b98d6e585c0347 (diff) | |
parent | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/baselineserver')
-rw-r--r-- | tests/baselineserver/shared/baselineprotocol.cpp | 2 | ||||
-rw-r--r-- | tests/baselineserver/src/baselineserver.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/baselineserver/shared/baselineprotocol.cpp b/tests/baselineserver/shared/baselineprotocol.cpp index e8797379b1..cbe3ec8798 100644 --- a/tests/baselineserver/shared/baselineprotocol.cpp +++ b/tests/baselineserver/shared/baselineprotocol.cpp @@ -373,7 +373,7 @@ bool BaselineProtocol::connect(const QString &testCase, bool *dryrun, const Plat errMsg.clear(); QByteArray serverName(qgetenv("QT_LANCELOT_SERVER")); if (serverName.isNull()) - serverName = "lancelot.test.qt.nokia.com"; + serverName = "lancelot.test.qt-project.org"; socket.connectToHost(serverName, ServerPort); if (!socket.waitForConnected(Timeout)) { diff --git a/tests/baselineserver/src/baselineserver.cpp b/tests/baselineserver/src/baselineserver.cpp index 9a4411c611..6a7cda393d 100644 --- a/tests/baselineserver/src/baselineserver.cpp +++ b/tests/baselineserver/src/baselineserver.cpp @@ -691,8 +691,8 @@ void BaselineHandler::testPathMapping() QStringList hosts; hosts << QLS("bq-ubuntu910-x86-01") << QLS("bq-ubuntu910-x86-15") - << QLS("osl-mac-master-5.test.qt.nokia.com") - << QLS("osl-mac-master-6.test.qt.nokia.com") + << QLS("osl-mac-master-5.test.qt-project.org") + << QLS("osl-mac-master-6.test.qt-project.org") << QLS("sv-xp-vs-010") << QLS("sv-xp-vs-011") << QLS("sv-solaris-sparc-008") |