diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-06-05 16:52:42 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-08-16 10:01:34 +0000 |
| commit | 0a234cd7497b87cca44fe66ed222c2581bf1f5c8 (patch) | |
| tree | 2d67d34cc4aafe6dcfeb8def845c971a11ba6837 | |
| parent | 6ed6274135d63e971c2f9742e71777134bd33d9a (diff) | |
Enable tests for boot2qt
The tests for boot2qt were disabled with commit
3ce3573b86414361cdacc9400e2d81249405b8af. The tests can
be enabled since qtdeclarative now fallbacks to software
renderer if OpenGL is not supported.
Also added more wait time for fetching model in
testModelTest() when running on Qemu.
Task-number: QTBUG-60268
Change-Id: I94bc8434fc72eb1013f73bc5f5f2a3bfc84e4dea
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tests/auto/integration/integration.pro | 3 | ||||
| -rw-r--r-- | tests/auto/modelview/modelview.pro | 1 | ||||
| -rw-r--r-- | tests/auto/modelview/tst_modelview.cpp | 8 |
4 files changed, 11 insertions, 4 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d4fba92..f942af4 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -10,6 +10,3 @@ sub_integration.depends = sub-localsockettestserver SUBDIRS += benchmarks repc sub_integration integration_multiprocess modelview cmake pods repcodegenerator repparser \ sub_localsockettestserver \ modelreplica - -# QTBUG-60268 -boot2qt: SUBDIRS -= sub_integration modelview diff --git a/tests/auto/integration/integration.pro b/tests/auto/integration/integration.pro index 601d9ad..d241f67 100644 --- a/tests/auto/integration/integration.pro +++ b/tests/auto/integration/integration.pro @@ -6,3 +6,6 @@ qnx: SUBDIRS += qnx local.path = local tcp.path = tcp qnx.path = qnx + +# QTBUG-61552 +boot2qt: SUBDIRS -= local diff --git a/tests/auto/modelview/modelview.pro b/tests/auto/modelview/modelview.pro index b89b500..b21c191 100644 --- a/tests/auto/modelview/modelview.pro +++ b/tests/auto/modelview/modelview.pro @@ -8,3 +8,4 @@ HEADERS += $$PWD/modeltest.h contains(QT_CONFIG, c++11): CONFIG += c++11 +boot2qt: DEFINES += SLOW_MODELTEST diff --git a/tests/auto/modelview/tst_modelview.cpp b/tests/auto/modelview/tst_modelview.cpp index e5e406f..c032959 100644 --- a/tests/auto/modelview/tst_modelview.cpp +++ b/tests/auto/modelview/tst_modelview.cpp @@ -1064,6 +1064,12 @@ void TestModelView::testServerInsertDataTree() compareData(&testTreeModel, model.data()); } +#ifdef SLOW_MODELTEST +#define MODELTEST_WAIT_TIME 10000 +#else +#define MODELTEST_WAIT_TIME +#endif + void TestModelView::testModelTest() { QScopedPointer<QAbstractItemModelReplica> repModel( m_client.acquireModel(QStringLiteral("test"))); @@ -1071,7 +1077,7 @@ void TestModelView::testModelTest() FetchData f(repModel.data()); f.addAll(); - QVERIFY(f.fetchAndWait()); + QVERIFY(f.fetchAndWait(MODELTEST_WAIT_TIME)); Q_UNUSED(test); } |