From 08ab764f63853f4c24832c37cc404b50a7e16028 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Thu, 16 Jun 2011 13:05:00 +0300
Subject: [PATCH] GUITESTS: More flexible test data paths.

Use build-time define to set the path to the source files
directory. Which then can be used to format path to the test
data. This allows running tests from out-of-source-tree -builds
that e.g. QtCreator does.
---
 gui/test/xmlreport/testxmlreport.cpp     | 4 ++--
 gui/test/xmlreport/xmlreport.pro         | 2 ++
 gui/test/xmlreportv1/testxmlreportv1.cpp | 2 +-
 gui/test/xmlreportv1/xmlreportv1.pro     | 2 ++
 gui/test/xmlreportv2/testxmlreportv2.cpp | 2 +-
 gui/test/xmlreportv2/xmlreportv2.pro     | 2 ++
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gui/test/xmlreport/testxmlreport.cpp b/gui/test/xmlreport/testxmlreport.cpp
index 433a3504f..0533fa6d3 100644
--- a/gui/test/xmlreport/testxmlreport.cpp
+++ b/gui/test/xmlreport/testxmlreport.cpp
@@ -37,13 +37,13 @@ void TestXmlReport::testUnquoteMessage()
 
 void TestXmlReport::testGetVersion1()
 {
-    const QString filepath("../xmlfiles/xmlreport_v1.xml");
+    const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v1.xml");
     QCOMPARE(XmlReport::determineVersion(filepath), 1);
 }
 
 void TestXmlReport::testGetVersion2()
 {
-    const QString filepath("../xmlfiles/xmlreport_v2.xml");
+    const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v2.xml");
     QCOMPARE(XmlReport::determineVersion(filepath), 2);
 }
 
diff --git a/gui/test/xmlreport/xmlreport.pro b/gui/test/xmlreport/xmlreport.pro
index b161b49c3..e1e428784 100644
--- a/gui/test/xmlreport/xmlreport.pro
+++ b/gui/test/xmlreport/xmlreport.pro
@@ -5,6 +5,8 @@ INCLUDEPATH += .
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 include(../common.pri)
 
 # tests
diff --git a/gui/test/xmlreportv1/testxmlreportv1.cpp b/gui/test/xmlreportv1/testxmlreportv1.cpp
index 3399728b5..91ddd9799 100644
--- a/gui/test/xmlreportv1/testxmlreportv1.cpp
+++ b/gui/test/xmlreportv1/testxmlreportv1.cpp
@@ -25,7 +25,7 @@
 
 void TestXmlReportV1::readXml()
 {
-    const QString filepath("../xmlfiles/xmlreport_v1.xml");
+    const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v1.xml");
     XmlReportV1 report(filepath);
     QVERIFY(report.Open());
     QList<ErrorItem> errors = report.Read();
diff --git a/gui/test/xmlreportv1/xmlreportv1.pro b/gui/test/xmlreportv1/xmlreportv1.pro
index 724d6691f..8563985e2 100644
--- a/gui/test/xmlreportv1/xmlreportv1.pro
+++ b/gui/test/xmlreportv1/xmlreportv1.pro
@@ -5,6 +5,8 @@ INCLUDEPATH += .
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 include(../common.pri)
 
 # tests
diff --git a/gui/test/xmlreportv2/testxmlreportv2.cpp b/gui/test/xmlreportv2/testxmlreportv2.cpp
index 1bcad6322..b564c46e0 100644
--- a/gui/test/xmlreportv2/testxmlreportv2.cpp
+++ b/gui/test/xmlreportv2/testxmlreportv2.cpp
@@ -25,7 +25,7 @@
 
 void TestXmlReportV2::readXml()
 {
-    const QString filepath("../xmlfiles/xmlreport_v2.xml");
+    const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v2.xml");
     XmlReportV2 report(filepath);
     QVERIFY(report.Open());
     QList<ErrorItem> errors = report.Read();
diff --git a/gui/test/xmlreportv2/xmlreportv2.pro b/gui/test/xmlreportv2/xmlreportv2.pro
index 7909029f3..fb1539a74 100644
--- a/gui/test/xmlreportv2/xmlreportv2.pro
+++ b/gui/test/xmlreportv2/xmlreportv2.pro
@@ -7,6 +7,8 @@ MOC_DIR = ../build
 
 include(../common.pri)
 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 # tests
 SOURCES += testxmlreportv2.cpp