From 5ee07bf6919dda0c9a192adedc9fc4512b7bba36 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Wed, 26 Mar 2014 13:52:09 +0100
Subject: Mark some tests as XFAIL on QNX

Extending this to stock QNX as well since it is not
BlackBerry 10 specific.

  - tst_QNumeric::floatDistance()
  - tst_QNumeric::floatDistance_double()
  - tst_QtJson::testNumbers_2()
  - tst_QtJson::toJsonLargeNumericValues()
  - tst_QtJson::parseNumbers()

Task-number: QTBUG-37066
Change-Id: If0e5d4fbefac5e8a0efed8ef8b1b7655ff6e7766
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
---
 tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp | 4 ++--
 tests/auto/corelib/json/tst_qtjson.cpp              | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
index 79df4b7055..0b4f0e3c4b 100644
--- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
+++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
@@ -167,7 +167,7 @@ void tst_QNumeric::floatDistance()
     QFETCH(float, val1);
     QFETCH(float, val2);
     QFETCH(quint32, expectedDistance);
-#ifdef Q_OS_BLACKBERRY
+#ifdef Q_OS_QNX
     QEXPECT_FAIL("denormal", "See QTBUG-37094", Continue);
 #endif
     QCOMPARE(qFloatDistance(val1, val2), expectedDistance);
@@ -214,7 +214,7 @@ void tst_QNumeric::floatDistance_double()
     QFETCH(double, val1);
     QFETCH(double, val2);
     QFETCH(quint64, expectedDistance);
-#ifdef Q_OS_BLACKBERRY
+#ifdef Q_OS_QNX
     QEXPECT_FAIL("denormal", "See QTBUG-37094", Continue);
 #endif
     QCOMPARE(qFloatDistance(val1, val2), expectedDistance);
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index 2f75ad631f..a17fe7561a 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -347,7 +347,7 @@ void tst_QtJson::testNumbers_2()
     QJsonDocument jDocument2(QJsonDocument::fromJson(ba));
     for (int power = 0; power <= 1075; power++) {
         floatValues_1[power] = jDocument2.object().value(QString::number(power)).toDouble();
-#ifdef Q_OS_BLACKBERRY
+#ifdef Q_OS_QNX
         if (power >= 970)
             QEXPECT_FAIL("", "See QTBUG-37066", Abort);
 #endif
@@ -1346,7 +1346,7 @@ void tst_QtJson::toJsonLargeNumericValues()
             "    ]\n"
             "}\n";
 
-#ifdef Q_OS_BLACKBERRY
+#ifdef Q_OS_QNX
     QEXPECT_FAIL("", "See QTBUG-37066", Continue);
 #endif
     QCOMPARE(json, expected);
@@ -1354,7 +1354,7 @@ void tst_QtJson::toJsonLargeNumericValues()
     QJsonDocument doc;
     doc.setObject(object);
     json = doc.toJson();
-#ifdef Q_OS_BLACKBERRY
+#ifdef Q_OS_QNX
     QEXPECT_FAIL("", "See QTBUG-37066", Continue);
 #endif
     QCOMPARE(json, expected);
@@ -1758,7 +1758,7 @@ void tst_QtJson::parseNumbers()
             json += numbers[i].str;
             json += " ]";
             QJsonDocument doc = QJsonDocument::fromJson(json);
-#ifdef Q_OS_BLACKBERRY
+#ifdef Q_OS_QNX
             if (0 == QString::compare(numbers[i].str, "1.1e-308"))
                 QEXPECT_FAIL("", "See QTBUG-37066", Abort);
 #endif
-- 
cgit v1.2.3