diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-27 16:49:03 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-27 16:49:03 (GMT) |
| commit | e63bbd5673061075cc1ff9ff528dfe2545b2696c (patch) | |
| tree | 316271d93fe0475c15aebe97398275d0c278f1f3 /tests/auto/moc | |
| parent | d6fb0a8a1536c752c9feb399ce9a160aa6049fce (diff) | |
| download | Qt-e63bbd5673061075cc1ff9ff528dfe2545b2696c.zip Qt-e63bbd5673061075cc1ff9ff528dfe2545b2696c.tar.gz Qt-e63bbd5673061075cc1ff9ff528dfe2545b2696c.tar.bz2 | |
fix autotest on windows
Diffstat (limited to 'tests/auto/moc')
| -rw-r--r-- | tests/auto/moc/tst_moc.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 860944c..8e5ecb4 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -1595,6 +1595,13 @@ void tst_Moc::warnings() QFETCH(QString, expectedStdOut); QFETCH(QString, expectedStdErr); +#ifdef Q_CC_MSVC + // for some reasons, moc compiled with MSVC uses a different output format + QRegExp lineNumberRe(":(\\d+):"); + lineNumbreRe.setMinimal(true); + expectedStdErr.replace(lineNumberRe, "(\\1):"); +#endif + QProcess proc; proc.start("moc", args); QVERIFY(proc.waitForStarted()); |