From 49674e35412ef5083964e105cc9cc109e981acf6 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 8 Aug 2011 11:55:35 +1000 Subject: test: only QEXPECT_FAIL tst_qgraphicstransform in release mode The floating point problem which causes this test to fail is not triggered if Qt is compiled in debug mode. Enable QEXPECT_FAIL more narrowly. Task-number: QTBUG-20661 Change-Id: I25f3260b516cd4fda9d8b711aa1140cbda821412 Reviewed-by: Kalle Lehtonen (cherry picked from commit 5d481fa2400b08bd11aae364e4f31ccc7a8e909c) Reviewed-by: Rohan McGovern --- tests/auto/qgraphicstransform/qgraphicstransform.pro | 2 ++ tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/qgraphicstransform/qgraphicstransform.pro b/tests/auto/qgraphicstransform/qgraphicstransform.pro index 67c939e..3da3408 100644 --- a/tests/auto/qgraphicstransform/qgraphicstransform.pro +++ b/tests/auto/qgraphicstransform/qgraphicstransform.pro @@ -1,3 +1,5 @@ load(qttest_p4) SOURCES += tst_qgraphicstransform.cpp CONFIG += parallel_test + +linux-*:contains(QT_CONFIG,release):DEFINES+=MAY_HIT_QTBUG_20661 diff --git a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp index 2e90cc1..ebb7dd2 100644 --- a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp +++ b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp @@ -359,7 +359,7 @@ void tst_QGraphicsTransform::rotation3dArbitraryAxis() exp.rotate(angle, axis); QTransform expected = exp.toTransform(1024.0f); -#ifdef Q_OS_LINUX +#if defined(MAY_HIT_QTBUG_20661) // These failures possibly relate to the float vs qreal issue mentioned // in the comment above fuzzyCompare(). if (sizeof(qreal) == sizeof(double)) { -- cgit v0.12