5 files changed, 17 insertions, 5 deletions
diff --git a/tests/auto/3rdparty/testsuites b/tests/auto/3rdparty/testsuites
new file mode 160000
+Subproject ddfcd98e8d3f78d696bb25ddcaacc3e3cba51e7
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
index 7c18bf6..e207a33 100644
--- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@ -117,6 +117,17 @@ void tst_XmlPatterns::initTestCase()
 #endif // QT_NO_PROCESS
 }
 
+#ifndef QT_NO_PROCESS
+static QByteArray msgProcessError(const char *what, const QProcess &process)
+{
+    QString result = QLatin1String(what) + QLatin1Char(' ')
+        + QDir::toNativeSeparators(process.program())
+        + QLatin1Char(' ') + process.arguments().join(QLatin1Char(' '))
+        + QLatin1String(": ") + process.errorString();
+    return result.toLocal8Bit();
+}
+#endif // !QT_NO_PROCESS
+
 void tst_XmlPatterns::xquerySupport()
 {
     if (QTest::currentDataTag() == QByteArray("Load query via FTP")
@@ -143,9 +154,10 @@ void tst_XmlPatterns::xquerySupport()
         process.setWorkingDirectory(inputFile(cwd));
 
     process.start(m_command, arguments);
+    QVERIFY2(process.waitForStarted(), msgProcessError("Failed to start", process).constData());
 
+    QVERIFY2(process.waitForFinished(), msgProcessError("Timeout running", process).constData());
     QCOMPARE(process.exitStatus(), QProcess::NormalExit);
-    QVERIFY(process.waitForFinished());
 
     if(process.exitCode() != expectedExitCode)
         QTextStream(stderr) << "stderr:" << process.readAllStandardError();
diff --git a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
index f42d18e..2895893 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
+++ b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
@@ -55,6 +55,7 @@ protected:
 
 tst_XmlPatternsDiagnosticsTS::tst_XmlPatternsDiagnosticsTS() : tst_SuiteTest(tst_SuiteTest::XQuerySuite, true)
 {
+    m_existingBaseline = QFINDTESTDATA("Baseline.xml");
 }
 
 void tst_XmlPatternsDiagnosticsTS::catalogPath(QString &write) const
diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.h b/tests/auto/xmlpatternsxqts/tst_suitetest.h
index 741e636..c21b7d3 100644
--- a/tests/auto/xmlpatternsxqts/tst_suitetest.h
+++ b/tests/auto/xmlpatternsxqts/tst_suitetest.h
@@ -83,12 +83,12 @@ private Q_SLOTS:
     void runTestSuite() const;
     void checkTestSuiteResult() const;
 
-private:
+protected:
     /**
      * An absolute path to the catalog.
      */
     QString         m_catalogPath;
-    const QString   m_existingBaseline;
+    QString   m_existingBaseline;
     const QString   m_candidateBaseline;
     const bool      m_abortRun;
     const SuiteType m_suiteType;
diff --git a/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
index 8a49e81..1acad24 100644
--- a/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
@@ -59,9 +59,8 @@ void tst_XmlPatternsXQTS::catalogPath(QString &write) const
     if(dontRun())
         QSKIP("This test takes too long time to run on the majority of platforms.");
 
-    write = QFINDTESTDATA("TESTSUITE/XQTSCatalog.xml");
+    write = QFINDTESTDATA("../3rdparty/testsuites/XQTS/XQTSCatalog.xml");
     return;
-
 }
 
 QTEST_MAIN(tst_XmlPatternsXQTS)