diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-06-19 12:52:24 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-08-11 10:06:51 +0000 |
| commit | ac79bf382a9fabed940b8f9be20feeb58ac205aa (patch) | |
| tree | a1ecc3d0139d44d994d60f7553ffe44cd80271df | |
| parent | dbb55fba566fd3878b5ef76a2216f0c3f961147f (diff) | |
Enable tests for boot2qt
The tests for boot2qt were disabled with commit
25e51976c3324630525346ccb785fafe48ea5ed9. The tests can
be enabled since qtdeclarative now fallbacks to software
renderer if OpenGL is not supported.
Also fixed tst_QChart::zoomOut which was doing direct comparison
of qreal variables. Changed it to use QCompare which internally
uses qFuzzyCompare and does not suffer from float precision
problems.
Task-number: QTBUG-60268
Change-Id: I9e9de2e3c5cdbe725587e522be852d6cc5f7fd00
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tests/auto/qchart/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/qchart/tst_qchart.cpp | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 321ca26c..81557a7f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -37,9 +37,6 @@ SUBDIRS += \ qtHaveModule(quick) { SUBDIRS += qml \ qml-qtquicktest - - # QTBUG-20268 - boot2qt: SUBDIRS -= qml-qtquicktest } !contains(QT_CONFIG, private_tests): SUBDIRS -= \ diff --git a/tests/auto/qchart/BLACKLIST b/tests/auto/qchart/BLACKLIST deleted file mode 100644 index a73cce28..00000000 --- a/tests/auto/qchart/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -[zoomOut] -# QTBUG-20268 -b2qt diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 75a395a2..3e835792 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -899,8 +899,8 @@ void tst_QChart::zoomOut() else QCOMPARE(minY, axisY->min()); - QVERIFY(maxX == axisX->max()); - QVERIFY(maxY == axisY->max()); + QCOMPARE(maxX, axisX->max()); + QCOMPARE(maxY, axisY->max()); } |