diff options
author | David Faure <david.faure@kdab.com> | 2014-07-24 12:41:56 +0200 |
---|---|---|
committer | David Faure <david.faure@kdab.com> | 2014-07-30 17:36:51 +0200 |
commit | 8dbc32a48e53a2e654bd27394ec306b86f1aeb0e (patch) | |
tree | c00ef2629e1e33457237f2b7839008ea73f9e20c /tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp | |
parent | 0b0bb319578bb2e2eced3a80ce3876a4408b72a7 (diff) |
tst_qqmlapplicationengine: clear $QT_MESSAGE_PATTERN
The test fails if it's set, because it looks at the output from testapp
and compares it with expected output.
Change-Id: Idc82e2f9024b72cb8be919c2d1bfa4efb4957e4e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp')
-rw-r--r-- | tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp index b261bb5191..9dcf68f50c 100644 --- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp +++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp @@ -64,6 +64,7 @@ private: void tst_qqmlapplicationengine::initTestCase() { + qputenv("QT_MESSAGE_PATTERN", ""); // don't let it modify the debug output from testapp buildDir = QDir::currentPath(); QQmlDataTest::initTestCase(); //Changes current path to src dir srcDir = QDir::currentPath(); @@ -123,7 +124,7 @@ void tst_qqmlapplicationengine::application() test_stderr_target.replace('\n', QByteArray("\r\n")); #endif QCOMPARE(test_stdout, QByteArray("")); - QCOMPARE(test_stderr, test_stderr_target); + QCOMPARE(QString(test_stderr), QString(test_stderr_target)); delete testProcess; QDir::setCurrent(srcDir); #else // !QT_NO_PROCESS |