From 1f62708c86bb94ca17834d035aa19014ae178e08 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Date: Fri, 31 Jul 2015 17:24:03 +0200
Subject: [PATCH] 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>
---
.../xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp | 1 +
tests/auto/xmlpatternsxqts/tst_suitetest.h | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
index f42d18e8..28958931 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 741e636d..c21b7d34 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;
--
GitLab