diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2009-11-12 10:46:49 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2009-11-13 13:05:15 (GMT) |
| commit | 5b32561d9047948a67fdc1988c547320a3e617a7 (patch) | |
| tree | 6787b78a067dd46790fc927e6bc6c34f9e8e9a77 /tests | |
| parent | 56f4d1256e8ef3a31c3664822b31cd6712a965f1 (diff) | |
| download | Qt-5b32561d9047948a67fdc1988c547320a3e617a7.zip Qt-5b32561d9047948a67fdc1988c547320a3e617a7.tar.gz Qt-5b32561d9047948a67fdc1988c547320a3e617a7.tar.bz2 | |
xmlpatterns autotest: adjust line endings
all test machines have "autocrlf = false", we need to adjust the tests
to that.
Reviewed-by: Frans Englich
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 22f6693..ff7c8c0 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -160,7 +160,9 @@ void tst_XmlPatterns::xquerySupport() QCOMPARE(process.exitCode(), expectedExitCode); const QByteArray rawProducedStderr((process.readAllStandardError())); - const QString fixedStderr(QString::fromLocal8Bit(rawProducedStderr).remove(m_filenameInStderr)); + QString fixedStderr(QString::fromLocal8Bit(rawProducedStderr).remove(m_filenameInStderr)); + // convert Windows line endings to Unix ones + fixedStderr.replace("\r\n", "\n"); const QString errorFileName(inputFile(QLatin1String(SRCDIR "stderrBaselines/") + QString::fromUtf8(QTest::currentDataTag()).remove(m_normalizeTestName) + |