From 84ad4e1b4082f85463124e834b4502ff7efce7df Mon Sep 17 00:00:00 2001
From: Rolland Dudemaine <rolland@ghs.com>
Date: Tue, 15 Nov 2011 17:28:31 +0100
Subject: Add specific INTEGRITY cases for autotests requiring a target path.

SRCDIR is not parsed the same way due to the different qmake generation process.
furthermore, the full host path doesn't seem like a good idea to use for the path of the target filesystem.
Use "/" as default.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
---
 tests/auto/qbytearray/qbytearray.pro                   | 2 ++
 tests/auto/qchar/qchar.pro                             | 2 ++
 tests/auto/qelapsedtimer/qelapsedtimer.pro             | 2 ++
 tests/auto/qfileinfo/qfileinfo.pro                     | 2 ++
 tests/auto/qresourceengine/qresourceengine.pro         | 2 ++
 tests/auto/qsharedpointer/qsharedpointer.pro           | 7 ++++++-
 tests/auto/qtemporaryfile/qtemporaryfile.pro           | 2 ++
 tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro | 6 +++++-
 8 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qbytearray/qbytearray.pro b/tests/auto/qbytearray/qbytearray.pro
index f195dc8..b954ca0 100644
--- a/tests/auto/qbytearray/qbytearray.pro
+++ b/tests/auto/qbytearray/qbytearray.pro
@@ -14,6 +14,8 @@ wince* {
   DEFINES += SRCDIR=\\\"./\\\"
 } else:symbian {
   TARGET.EPOCHEAPSIZE="0x100 0x800000"
+} else:integrity {
+  DEFINES += SRCDIR=\"/\"
 } else {
   DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/qchar/qchar.pro
index 1681220..cbbde7c 100644
--- a/tests/auto/qchar/qchar.pro
+++ b/tests/auto/qchar/qchar.pro
@@ -10,6 +10,8 @@ DEPLOYMENT += deploy
 
 symbian: {
     DEFINES += SRCDIR=""
+} else:integrity {
+    DEFINES += SRCDIR=\"/\"
 } else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qelapsedtimer/qelapsedtimer.pro b/tests/auto/qelapsedtimer/qelapsedtimer.pro
index 8768876..1d74fc5 100644
--- a/tests/auto/qelapsedtimer/qelapsedtimer.pro
+++ b/tests/auto/qelapsedtimer/qelapsedtimer.pro
@@ -7,6 +7,8 @@ wince* {
 } else:symbian {
     # do not define SRCDIR at all
     TARGET.EPOCHEAPSIZE = 0x100000 0x3000000
+} else:integrity {
+    DEFINES += SRCDIR=\"/\"
 } else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro
index 7a2cf9c..d0e284b 100644
--- a/tests/auto/qfileinfo/qfileinfo.pro
+++ b/tests/auto/qfileinfo/qfileinfo.pro
@@ -26,6 +26,8 @@ wince* {
     DEFINES += SRCDIR=\\\"\\\"
 } else:symbian {
     # do not define SRCDIR at all
+} else:integrity {
+    DEFINES += SRCDIR=\"/\"
 } else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qresourceengine/qresourceengine.pro b/tests/auto/qresourceengine/qresourceengine.pro
index 9ca6994..6359549 100644
--- a/tests/auto/qresourceengine/qresourceengine.pro
+++ b/tests/auto/qresourceengine/qresourceengine.pro
@@ -40,6 +40,8 @@ wince*|symbian:{
     testsub2.path = testqrc/test/test
     DEPLOYMENT += deploy test alias other search1 search2 sub testsub testsub2
     !symbian:DEFINES += SRCDIR=\\\"\\\"
+} else:integrity {
+    DEFINES += SRCDIR=\"/\"
 } else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qsharedpointer/qsharedpointer.pro b/tests/auto/qsharedpointer/qsharedpointer.pro
index 014006e..37ab4ce 100644
--- a/tests/auto/qsharedpointer/qsharedpointer.pro
+++ b/tests/auto/qsharedpointer/qsharedpointer.pro
@@ -9,7 +9,12 @@ HEADERS += forwarddeclared.h \
     wrapper.h
 
 QT = core
-!symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+integrity {
+    DEFINES += SRCDIR=\"/\"
+} else:!symbian {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
 
 include(externaltests.pri)
 CONFIG += parallel_test
diff --git a/tests/auto/qtemporaryfile/qtemporaryfile.pro b/tests/auto/qtemporaryfile/qtemporaryfile.pro
index 64a043b..4cbc76d 100644
--- a/tests/auto/qtemporaryfile/qtemporaryfile.pro
+++ b/tests/auto/qtemporaryfile/qtemporaryfile.pro
@@ -7,6 +7,8 @@ symbian {
     testData.files = tst_qtemporaryfile.cpp
     testData.path = .
     DEPLOYMENT += testData
+} else:integrity {
+    DEFINES += SRCDIR=\"/\"
 }else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro
index 5f3cb11..c52ca52 100644
--- a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro
+++ b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro
@@ -2,7 +2,11 @@ load(qttest_p4)
 QT = core
 HEADERS += 
 SOURCES += tst_qtextboundaryfinder.cpp 
-!symbian:*:DEFINES += SRCDIR=\\\"$$PWD\\\"
+integrity {
+    DEFINES += SRCDIR=\"/\"
+} else:!symbian {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
 
 wince*|symbian:{
    addFiles.files = data
-- 
cgit v0.12