From 9ac5755fb53387a79e5d9c007501800ab9963bed Mon Sep 17 00:00:00 2001
From: Kent Hansen <khansen@trolltech.com>
Date: Fri, 26 Jun 2009 10:41:37 +0200
Subject: make autotests work with shadowbuilds

Can't assume that the executable and source are in the same dir.
---
 tests/auto/qscriptengine/qscriptengine.pro               | 1 +
 tests/auto/qscriptengine/tst_qscriptengine.cpp           | 2 +-
 tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro     | 1 +
 tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp | 2 +-
 tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro     | 1 +
 tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 2 +-
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro
index cf3ced3..b5aa621 100644
--- a/tests/auto/qscriptengine/qscriptengine.pro
+++ b/tests/auto/qscriptengine/qscriptengine.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 QT += script
 SOURCES += tst_qscriptengine.cpp 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 wince*: {
    addFiles.sources = script
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 68df392..c17454d 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -1562,7 +1562,7 @@ static QScriptValue __import__(QScriptContext *ctx, QScriptEngine *eng)
 void tst_QScriptEngine::importExtension()
 {
     QStringList libPaths = QCoreApplication::instance()->libraryPaths();
-    QCoreApplication::instance()->setLibraryPaths(QStringList() << ".");
+    QCoreApplication::instance()->setLibraryPaths(QStringList() << SRCDIR);
 
     QStringList availableExtensions;
     {
diff --git a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
index b8109cc..f6a6aeb 100644
--- a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
+++ b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 QT = core script
 SOURCES  += tst_qscriptjstestsuite.cpp
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 wince*: {
 testFiles.sources = tests
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index 66004f8..0194730 100644
--- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
+++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
@@ -389,7 +389,7 @@ int tst_Suite::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
 
 tst_Suite::tst_Suite()
 {
-    testsDir = QDir(".");
+    testsDir = QDir(SRCDIR);
     bool testsFound = testsDir.cd("tests");
     if (!testsFound) {
         qWarning("*** no tests/ dir!");
diff --git a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
index 9e35801..c07ab53 100644
--- a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
+++ b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 QT = core script
 SOURCES  += tst_qscriptv8testsuite.cpp
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 wince*: {
 testFiles.sources = tests
diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
index 77bfeb5..50eb19f 100644
--- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
@@ -193,7 +193,7 @@ int tst_Suite::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
 
 tst_Suite::tst_Suite()
 {
-    testsDir = QDir(".");
+    testsDir = QDir(SRCDIR);
     bool testsFound = testsDir.cd("tests");
     if (!testsFound) {
         qWarning("*** no tests/ dir!");
-- 
cgit v0.12