diff options
Diffstat (limited to 'tests/auto/testlib/selftests/tst_selftests.cpp')
| -rw-r--r-- | tests/auto/testlib/selftests/tst_selftests.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 64f324e26c..3f11ea50b6 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -568,6 +568,10 @@ static QProcessEnvironment processEnvironment() if (useVariable) result.insert(key, systemEnvironment.value(key)); } + // Avoid interference from any qtlogging.ini files, e.g. in /etc/xdg/QtProject/: + result.insert(QStringLiteral("QT_LOGGING_RULES"), + // Must match generate_expected_output.py's main()'s value: + QStringLiteral("*.debug=true;qt.qpa.screen=false")); } return result; } @@ -686,8 +690,8 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge QList<QByteArray> res = splitLines(actualOutputs[n]); const QString expectedFileName = expectedFileNameFromTest(subdir, logger); QList<QByteArray> exp = expectedResult(expectedFileName); -#if (defined (Q_CC_MSVC) && _MSC_VER < 1900)|| defined(Q_CC_MINGW) - // MSVC up to MSVC2013, MinGW format double numbers differently +#ifdef Q_CC_MINGW + // MinGW formats double numbers differently if (n == 0 && subdir == QStringLiteral("float")) { for (int i = 0; i < exp.size(); ++i) { exp[i].replace("e-07", "e-007"); |