summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-06 17:08:45 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-06 17:17:02 (GMT)
commit2fa8b39c8a687550934e9668384f0bbe9f56f550 (patch)
tree19ad5ee2ca5c20c134d08df04e8cdbdb8c2b7949
parent7a2c04a3b198df42e69e9700f550f39aac319fd4 (diff)
downloadQt-2fa8b39c8a687550934e9668384f0bbe9f56f550.zip
Qt-2fa8b39c8a687550934e9668384f0bbe9f56f550.tar.gz
Qt-2fa8b39c8a687550934e9668384f0bbe9f56f550.tar.bz2
fix autotest
fixing QProcess::execute() revealed that this test has always been broken on windows.
-rw-r--r--tests/auto/linguist/lrelease/tst_lrelease.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp
index fdb384e..3b2c2d2 100644
--- a/tests/auto/linguist/lrelease/tst_lrelease.cpp
+++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp
@@ -171,7 +171,12 @@ void tst_lrelease::mixedcodecs()
{
QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/mixedcodecs-ts11.ts"));
QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/mixedcodecs-ts20.ts"));
+#ifdef Q_OS_WIN
+ QVERIFY(!QProcess::execute("fc /b testdata\\mixedcodecs-ts11.qm testdata\\mixedcodecs-ts20.qm"));
+#else
QVERIFY(!QProcess::execute("cmp testdata/mixedcodecs-ts11.qm testdata/mixedcodecs-ts20.qm"));
+#endif
+
QTranslator translator;
QVERIFY(translator.load("testdata/mixedcodecs-ts11.qm"));
qApp->installTranslator(&translator);