From eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 11 Feb 2014 10:06:49 +0100 Subject: test: Don't fail *all* tests if the network test server is not set up Since not all tests for tst_qxmlquery and tst_xmlpatterns depend on the network test server being set up, now we just fail those which really depend on it allowing the rest to be normally run. Change-Id: I0588cf986ffddea117cee680e07e1a8cc4d68436 Reviewed-by: Peter Hartmann --- tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/auto/xmlpatterns') diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 86020dd..a5c6c84 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -104,8 +104,6 @@ tst_XmlPatterns::tst_XmlPatterns() : m_generatedTests(0) void tst_XmlPatterns::initTestCase() { - QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); - QVERIFY(m_normalizeTestName.isValid()); QProcess process; @@ -126,6 +124,10 @@ void tst_XmlPatterns::initTestCase() void tst_XmlPatterns::xquerySupport() { + if (QTest::currentDataTag() == QByteArray("Load query via FTP") + || QTest::currentDataTag() == QByteArray("Load query via HTTP")) + QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); + if(m_dontRun) QSKIP("The command line utility is not in the path."); -- cgit v1.2.1