From 224b22e8c923e14420fd176bdc09e2d17d65f7c7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Wed, 18 Mar 2015 08:42:17 +0100
Subject: Remove macro DEBUG_CODE from Test SDK.

It was used to disable code/variables referenced in Q_ASSERT_X.
Since the macro is now expanded in release mode as well, this
causes compilation errors.

Change-Id: I5b90515c042f9d3e76be84cd5385eae081a037c8
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
---
 tests/auto/xmlpatternssdk/XMLWriter.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/tests/auto/xmlpatternssdk/XMLWriter.cpp b/tests/auto/xmlpatternssdk/XMLWriter.cpp
index 635f693..71ef022 100644
--- a/tests/auto/xmlpatternssdk/XMLWriter.cpp
+++ b/tests/auto/xmlpatternssdk/XMLWriter.cpp
@@ -76,12 +76,6 @@ using namespace QPatternistSDK;
 typedef QPair<QString, QString> NSBinding;
 typedef QList<NSBinding> NSBindingList;
 
-#ifdef QT_NO_DEBUG
-#   define DEBUG_CODE(code)
-#else
-#   define DEBUG_CODE(code) code
-#endif
-
 class XMLWriter::Private
 {
 public:
@@ -290,8 +284,8 @@ public:
     QIODevice *dev;
     QStack<bool> hasContentStack;
     QString errorString;
-    DEBUG_CODE(QStack<QString> tags;)
-    DEBUG_CODE(QStack<NSBindingList> namespaceTracker;)
+    QStack<QString> tags;
+    QStack<NSBindingList> namespaceTracker;
 };
 
 /**
@@ -364,8 +358,8 @@ bool XMLWriter::startElement(const QString &qName,
     serialize('<');
     serialize(qName);
 
-    DEBUG_CODE(d->tags.push(qName));
-    DEBUG_CODE(d->namespaceTracker.push(d->namespaces));
+    d->tags.push(qName);
+    d->namespaceTracker.push(d->namespaces);
 
     /* Add namespace declarations. */
     const NSBindingList::const_iterator end(d->namespaces.constEnd());
@@ -421,7 +415,7 @@ bool XMLWriter::endElement(const QString &qName)
     Q_ASSERT_X(d->tags.pop() == qName, Q_FUNC_INFO,
                "The element tags are not balanced, the produced XML is invalid.");
 
-    DEBUG_CODE(d->namespaceTracker.pop());
+    d->namespaceTracker.pop();
 
     /* "this" element is content for our parent, so ensure hasElementContent is true. */
 
-- 
cgit v1.2.1


From 30ba24347cbb1af8f8ad1949297702ccc83aa410 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 17 Dec 2014 19:39:17 -0800
Subject: Remove the old headersclean unit test

We have configure -headersclean now

Change-Id: Iaa084ece95cefd5264a34726d85d13ea7a65016d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 tests/auto/headersclean/headersclean.pro | 3 ---
 tests/auto/host.pro                      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 tests/auto/headersclean/headersclean.pro

diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
deleted file mode 100644
index ecf5f1f..0000000
--- a/tests/auto/headersclean/headersclean.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-QT = xmlpatterns
-load(qt_headersclean)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/host.pro b/tests/auto/host.pro
index 6bc8753..4095052 100644
--- a/tests/auto/host.pro
+++ b/tests/auto/host.pro
@@ -1,4 +1,4 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-           headersclean \
+
 
-- 
cgit v1.2.1


From a0fdb626e5779e0f393fb9d031bc44d5f48de263 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Date: Sat, 14 Mar 2015 12:19:09 +0100
Subject: Always summarize test results, even with unchanged baseline

I currently have many failures (I assume through bad testsuite set up),
they go by silently on the second run, instead now there will always
be output:
PASS   : tst_XmlPatternsSchemaTS::runTestSuite()
SUMMARY:
        Total:                39193
        Failures:             39193
        Passes:               0
        Not tested:           0
        Pass percentage(%):   0
        Unexpected failures:  0
        Unexpected passes:    0
Result was identical to the baseline, baseline was not updated.
PASS   : tst_XmlPatternsSchemaTS::checkTestSuiteResult()

Change-Id: I4e11832ea711b8cb9feff088a09434122968d080
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 tests/auto/xmlpatternssdk/Worker.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/auto/xmlpatternssdk/Worker.cpp b/tests/auto/xmlpatternssdk/Worker.cpp
index d17696e..883599d 100644
--- a/tests/auto/xmlpatternssdk/Worker.cpp
+++ b/tests/auto/xmlpatternssdk/Worker.cpp
@@ -209,6 +209,8 @@ void Worker::threadFinished()
     else if(m_unexpectedPasses.isEmpty() && baselineCount == resultCount)
     {
         err << "Result was identical to the baseline, baseline was not updated.\n";
+        err.flush();
+        QTextStream(stderr) << out;
         m_eventLoop.exit(ExitCode::Success);
         return;
     }
-- 
cgit v1.2.1