summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo Asplin <jo.asplin@nokia.com>2011-11-03 12:16:50 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-01 00:43:08 (GMT)
commite6bd33d4aef0e4538d7918e7ab130624c911b553 (patch)
treec6413ce60a915b94288cc93706c2d272e235e6c0
parentad70be4e5b5c55bd838c389bda7d83c2726a69ea (diff)
downloadQt-e6bd33d4aef0e4538d7918e7ab130624c911b553.zip
Qt-e6bd33d4aef0e4538d7918e7ab130624c911b553.tar.gz
Qt-e6bd33d4aef0e4538d7918e7ab130624c911b553.tar.bz2
Re-enabled passing tests in tst_qvariant
To increase the effective test coverage, this patch re-enables the tst_qvariant test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: Ibf0dc3caf50d34084fa50cf76d199e77a42f6e16 Reviewed-by: Olivier Goffart <ogoffart@kde.org> (cherry picked from commit e142a64a33a54c433a38d330d64292b7e7698c92) Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--tests/auto/qvariant/qvariant.pro2
-rw-r--r--tests/auto/qvariant/tst_qvariant.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qvariant/qvariant.pro b/tests/auto/qvariant/qvariant.pro
index 8517d02..2c9c8d7 100644
--- a/tests/auto/qvariant/qvariant.pro
+++ b/tests/auto/qvariant/qvariant.pro
@@ -3,5 +3,3 @@ SOURCES += tst_qvariant.cpp
QT += network
contains(QT_CONFIG, qt3support): QT += qt3support
-
-CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 8966a5c..f66d92c 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -3140,6 +3140,9 @@ void tst_QVariant::task256984_setValue()
void tst_QVariant::numericalConvert()
{
+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(__x86_64__)
+ QSKIP("Known to fail due to a GCC bug on at least Ubuntu 10.04 32-bit - check QTBUG-8959", SkipAll);
+#endif
QVariant vfloat(float(5.3));
QVariant vdouble(double(5.3));
QVariant vreal(qreal(5.3));