diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-11 15:51:37 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-11 15:51:52 +0100 |
| commit | 943be6958436ffefc0b0389c152adc91961f25e9 (patch) | |
| tree | e0bc3266c003905ab11a915f6142361572246914 /tests/auto/xmlpatterns | |
| parent | 348be51296a6efd493a7a71fb81ada3430c9cf4e (diff) | |
| parent | eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0 (diff) | |
| download | qtxmlpatterns-943be6958436ffefc0b0389c152adc91961f25e9.tar.gz | |
Merge remote-tracking branch 'origin/stable' into devv5.3.0-alpha1
Change-Id: I60405f79dbe590e2f598d57f80794364f415c566
Diffstat (limited to 'tests/auto/xmlpatterns')
| -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."); |