summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-07-31 17:24:03 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-01 19:17:09 +0000
commit1f62708c86bb94ca17834d035aa19014ae178e08 (patch)
treeb312ab0cd48dafcbe98015441d600ac4e3b1e3d7
parentbde71a7f9e8d2c64a8cbf703da01b6241b901371 (diff)
downloadqtxmlpatterns-1f62708c86bb94ca17834d035aa19014ae178e08.tar.gz
qtxmlpatterns-1f62708c86bb94ca17834d035aa19014ae178e08.tar.bz2
qtxmlpatterns-1f62708c86bb94ca17834d035aa19014ae178e08.zip
xmlpatternsdiagnosticsts test: use correct baseline
At least on OS X, the test would use the baseline of xmlpatternsxqts since that's where tst_suitetest.h is. QFINDTESTDATA would then resolve Baseline.xml relative to that. Change-Id: I860d7e3143365b33901f721caed813d4d594f28d Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp1
-rw-r--r--tests/auto/xmlpatternsxqts/tst_suitetest.h4
2 files changed, 3 insertions, 2 deletions
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;