summaryrefslogtreecommitdiffstats
path: root/tests/auto/qchar
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-24 19:21:46 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-25 12:54:01 (GMT)
commit40e6d23243acbed2705bd53cd1e634697ba99ac2 (patch)
treecd5d282ce5ec20dfb9bb12e988d58e0161f2cf42 /tests/auto/qchar
parentd2ddf724b5d16e88efe6f0a8c362c7ad3888f412 (diff)
downloadQt-40e6d23243acbed2705bd53cd1e634697ba99ac2.zip
Qt-40e6d23243acbed2705bd53cd1e634697ba99ac2.tar.gz
Qt-40e6d23243acbed2705bd53cd1e634697ba99ac2.tar.bz2
Autotest: make tst_qchar run out-of-source too
Diffstat (limited to 'tests/auto/qchar')
-rw-r--r--tests/auto/qchar/qchar.pro1
-rw-r--r--tests/auto/qchar/tst_qchar.cpp5
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/qchar/qchar.pro
index fca4ef6..0a3fcc3 100644
--- a/tests/auto/qchar/qchar.pro
+++ b/tests/auto/qchar/qchar.pro
@@ -8,3 +8,4 @@ deploy.sources += NormalizationTest.txt
DEPLOYMENT = deploy
}
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qchar/tst_qchar.cpp b/tests/auto/qchar/tst_qchar.cpp
index 241b9a5..547147c 100644
--- a/tests/auto/qchar/tst_qchar.cpp
+++ b/tests/auto/qchar/tst_qchar.cpp
@@ -499,10 +499,7 @@ void tst_QChar::normalization()
QVERIFY(composed.normalized(QString::NormalizationForm_KC) == decomposed);
}
- QFile f("NormalizationTest.txt");
- // Windows - current directory is the debug/release subdirectory where the executable is located
- if (!f.exists())
- f.setFileName("../NormalizationTest.txt");;
+ QFile f(SRCDIR "NormalizationTest.txt");
if (!f.exists()) {
QFAIL("Couldn't find NormalizationTest.txt");
return;