From fb1dc19bf195c530b7f44d18cc927472b9866a46 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 8 Apr 2016 09:10:17 +0200 Subject: tst_XmlPatterns::xquerySupport - silence logging category On 10.11 SSL code started producing error messages recently (under investigation) making a test, that expects no error messages to fail. It's a quick and dirty fix. Change-Id: I2339aad551633b378727329d326e610e669b3b2f Reviewed-by: Akseli Salovaara Reviewed-by: Timur Pocheptsov --- tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests') diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 61fa555..223f713 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -148,6 +148,12 @@ void tst_XmlPatterns::xquerySupport() if(!cwd.isEmpty()) process.setWorkingDirectory(inputFile(cwd)); +#ifdef Q_OS_OSX + QProcessEnvironment env(process.processEnvironment()); + env.insert("QT_LOGGING_RULES", "qt.network.ssl=false"); + process.setProcessEnvironment(env); +#endif + process.start(m_command, arguments); QVERIFY2(process.waitForStarted(), msgProcessError("Failed to start", process).constData()); -- cgit v1.2.1 From 9751d3d82eecb4f2c2a805783fbcce9ccd189fea Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 4 May 2016 08:32:53 +0200 Subject: tst_XmlPattern:xquerySupport - silence QSsl's debug output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit None of tests expects our own debug output in the processe's output, thus if we have something (even a minor warning) - the test can fail. It was first found on OS X 10.11 with Secure Transport backend, now pops up with OpenSSL back-end also (Windows 7) Change-Id: I19108416048bf89feae2648106b4a4ba8604aa93 Reviewed-by: Jani Heikkinen Reviewed-by: Tony Sarajärvi --- tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 223f713..e182565 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -148,11 +148,9 @@ void tst_XmlPatterns::xquerySupport() if(!cwd.isEmpty()) process.setWorkingDirectory(inputFile(cwd)); -#ifdef Q_OS_OSX QProcessEnvironment env(process.processEnvironment()); env.insert("QT_LOGGING_RULES", "qt.network.ssl=false"); process.setProcessEnvironment(env); -#endif process.start(m_command, arguments); QVERIFY2(process.waitForStarted(), msgProcessError("Failed to start", process).constData()); -- cgit v1.2.1