Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I41beab20e4de378725e3e2efd929ddd83460d9d8

1 files changed, 35 insertions, 1 deletions

diff --git a/tests/auto/xmlpatternssdk/TestCase.cpp b/tests/auto/xmlpatternssdk/TestCase.cpp
index d84ac06..9ae86ad 100644
--- a/tests/auto/xmlpatternssdk/TestCase.cpp
+++ b/tests/auto/xmlpatternssdk/TestCase.cpp
@@ -38,6 +38,7 @@
 #include <QXmlResultItems>
 #include <QXmlSerializer>
 #include <private/qxmlquery_p.h>
+#include <algorithm>
 
 #include "DebugExpressionFactory.h"
 #include "ExternalSourceLoader.h"
@@ -62,9 +63,23 @@ TestCase::~TestCase()
     delete m_result;
 }
 
+static bool lessThan(const char *a, const char *b)
+{
+    return qstrcmp(a, b) < 0;
+}
+
 TestResult::List TestCase::execute(const ExecutionStage stage,
                                    TestSuite *)
 {
+    ++TestCase::executions;
+
+    if ((TestCase::executions < TestCase::executeRange.first) || (TestCase::executions > TestCase::executeRange.second)) {
+        qDebug("Skipping test case #%6d", TestCase::executions);
+        return TestResult::List();
+    }
+
+    const QByteArray nm = name().toAscii();
+
     if(name() == QLatin1String("Constr-cont-document-3"))
     {
             TestResult::List result;
@@ -95,9 +110,28 @@ TestResult::List TestCase::execute(const ExecutionStage stage,
         result.append(createTestResult(TestResult::Fail, QLatin1String("Skipped this test, we crash on it.")));
         return result;
     }
+    else {
+        // Should be sorted in the order that std::binary_search expects
+        static const char *crashes[] = {"Constr-attr-content-4",
+                                        "K2-DirectConElem-12",
+                                        "K2-DirectConElem-50",
+                                        "K2-DirectConElemAttr-10",
+                                        "K2-DirectConElemAttr-18",
+                                        "K2-DirectConElemAttr-19",
+                                        "K2-DirectConElemAttr-20",
+                                        "K2-DirectConElemAttr-21"
+                                        };
+
+        const bool skip = std::binary_search(&crashes[0], &crashes[sizeof(crashes)/sizeof(crashes[0])], nm.constData(), lessThan);
+        if (skip) {
+            TestResult::List result;
+            result.append(createTestResult(TestResult::Fail, QLatin1String("Skipped this test, we crash on it.")));
+            return result;
+        }
+    }
 
-    qDebug() << "Running test case: " << name();
 
+    qDebug("Running test case #%6d: %s", TestCase::executions, nm.constData());
     return execute(stage);
 
     Q_ASSERT(false);