diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-11 10:06:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 10:38:56 +0100 |
| commit | eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0 (patch) | |
| tree | ed037e5ca798182ae48c60649ce30830e5f1c426 /tests/auto/xmlpatterns/tst_xmlpatterns.cpp | |
| parent | ecf06489d90385cf2ca67dc5f70529f76421beae (diff) | |
| download | qtxmlpatterns-eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0.tar.gz | |
test: Don't fail *all* tests if the network test server is not set upold/5.2
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 <phartmann@blackberry.com>
Diffstat (limited to 'tests/auto/xmlpatterns/tst_xmlpatterns.cpp')
| -rw-r--r-- | tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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."); |