diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-12 11:16:12 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-12 11:17:28 (GMT) |
| commit | b4067f455dca3007236a1043d641e92ecb8d3d54 (patch) | |
| tree | 2744c404a2306a6d819e3bdca0aa786efea774a3 /tests/auto/linguist | |
| parent | 273b575e16d0c84fa6b57b70a74107b86ad7aaa3 (diff) | |
| download | Qt-b4067f455dca3007236a1043d641e92ecb8d3d54.zip Qt-b4067f455dca3007236a1043d641e92ecb8d3d54.tar.gz Qt-b4067f455dca3007236a1043d641e92ecb8d3d54.tar.bz2 | |
remove trimming of (expected) output
it's needless and potentially detrimental
Diffstat (limited to 'tests/auto/linguist')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt | 1 | ||||
| -rw-r--r-- | tests/auto/linguist/lupdate/tst_lupdate.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt index 8d057d8..e3543c9 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt @@ -5,3 +5,4 @@ .*/lupdate/testdata/good/parsecpp2/main.cpp:61: Excess closing brace .* .*/lupdate/testdata/good/parsecpp2/main.cpp:65: Excess closing brace .* + diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp index f0ff350..5c910da 100644 --- a/tests/auto/linguist/lupdate/tst_lupdate.cpp +++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp @@ -128,7 +128,7 @@ void tst_lupdate::doCompare(const QStringList &actual, const QString &expectedFn { QFile file(expectedFn); QVERIFY2(file.open(QIODevice::ReadOnly | QIODevice::Text), qPrintable(expectedFn)); - QStringList expected = QString(file.readAll()).trimmed().split('\n'); + QStringList expected = QString(file.readAll()).split('\n'); int ei = 0, ai = 0, em = expected.size(), am = actual.size(); int oei = 0, oai = 0, oem = em, oam = am; @@ -217,7 +217,7 @@ void tst_lupdate::doCompare(const QString &actualFn, const QString &expectedFn, { QFile afile(actualFn); QVERIFY2(afile.open(QIODevice::ReadOnly | QIODevice::Text), qPrintable(actualFn)); - QStringList actual = QString(afile.readAll()).trimmed().split('\n'); + QStringList actual = QString(afile.readAll()).split('\n'); doCompare(actual, expectedFn, err); } @@ -282,7 +282,7 @@ void tst_lupdate::good() proc.setProcessChannelMode(QProcess::MergedChannels); proc.start(m_cmdLupdate + ' ' + lupdatecmd, QIODevice::ReadWrite | QIODevice::Text); QVERIFY2(proc.waitForFinished(5000), qPrintable(lupdatecmd)); - QByteArray output = proc.readAll().trimmed(); + QByteArray output = proc.readAll(); QVERIFY2(proc.exitStatus() == QProcess::NormalExit, "\"lupdate " + lupdatecmd.toLatin1() + "\" crashed\n" + output); QVERIFY2(!proc.exitCode(), |