summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-06 11:51:43 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-06 18:16:22 (GMT)
commit1ee6d3dc9529be1304c5d546e92bf1db832b5bb4 (patch)
tree7321722fe381014f8e334743f7d82c0abd5e6a93 /tests
parent2bd2e35078e0cdf9f1458892adcd0939504b59bb (diff)
downloadQt-1ee6d3dc9529be1304c5d546e92bf1db832b5bb4.zip
Qt-1ee6d3dc9529be1304c5d546e92bf1db832b5bb4.tar.gz
Qt-1ee6d3dc9529be1304c5d546e92bf1db832b5bb4.tar.bz2
look for the .result file in the dir where the output is expected to go
that makes manual diffing simpler and makes more complex dir structures less confusing.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/backslashes/ts/project.ts.result (renamed from tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result)0
-rw-r--r--tests/auto/linguist/lupdate/tst_lupdate.cpp2
3 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
index 33eb1f3..4698b2b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
@@ -1,9 +1,3 @@
SOURCES += src\main.cpp
TRANSLATIONS = ts\project.ts
-
-
-!exists(ts) {
- win32: system(md ts)
- else: system(mkdir ts)
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/backslashes/ts/project.ts.result
index d3a5fdf..d3a5fdf 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/ts/project.ts.result
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp
index e880eed..0442d27 100644
--- a/tests/auto/linguist/lupdate/tst_lupdate.cpp
+++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp
@@ -167,7 +167,6 @@ void tst_lupdate::good()
QFETCH(QString, directory);
QString dir = m_basePath + "good/" + directory;
- QString expectedFile = dir + QLatin1String("/project.ts.result");
qDebug() << "Checking...";
@@ -213,6 +212,7 @@ void tst_lupdate::good()
return;
}
+ QString expectedFile = generatedtsfile + QLatin1String(".result");
doCompare(generatedtsfile, expectedFile, false);
}