summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2021-02-12 11:28:52 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-19 07:20:23 +0000
commit5136cc1f7b0d0012faa19e08a23be37675200935 (patch)
tree9742e028bfa316cab14f57c65073324c8612cfe2
parent974fc46c3d69c270c0260c877aa4e9a0979edec1 (diff)
tst_qquickdesignersupport: skip crashing tests
Blacklisting doesn't work when the tests crash, use the emulation detection instead and skip tests. Task-number: QTBUG-90869 Change-Id: Icd9cff8b9d45edc2f97ae13acdf0e71ed44aa0e4 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 77156cd98f3e29d9bd89df335bb172e59da43483) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/quick/qquickdesignersupport/BLACKLIST7
-rw-r--r--tests/auto/quick/qquickdesignersupport/CMakeLists.txt1
-rw-r--r--tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp9
3 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/quick/qquickdesignersupport/BLACKLIST b/tests/auto/quick/qquickdesignersupport/BLACKLIST
deleted file mode 100644
index 247dc9fe82..0000000000
--- a/tests/auto/quick/qquickdesignersupport/BLACKLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-# QTBUG-90869
-[testSimpleBindings]
-ci b2qt
-[testDotProperties]
-ci b2qt
-[testItemReparenting]
-ci b2qt
diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
index e1eb2ee997..2cdb7328ce 100644
--- a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
+++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
@@ -27,6 +27,7 @@ qt_internal_add_test(tst_qquickdesignersupport
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickPrivate
+ Qt::TestPrivate
TESTDATA ${test_data}
)
diff --git a/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp b/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp
index 555128e5da..6165e0ee93 100644
--- a/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp
+++ b/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp
@@ -42,6 +42,7 @@
#include <private/qquickrectangle_p.h>
#include "../../shared/util.h"
#include "../shared/visualtestutil.h"
+#include <QtTest/private/qemulationdetector_p.h>
using namespace QQuickVisualTestUtil;
@@ -663,6 +664,9 @@ void tst_qquickdesignersupport::testComponentOnCompleteSignal()
void tst_qquickdesignersupport::testSimpleBindings()
{
+ if (QTestPrivate::isRunningArmOnX86())
+ QSKIP("Crashes in QEMU. (QTBUG-90869)");
+
QScopedPointer<QQuickView> view(new QQuickView);
view->engine()->setOutputWarningsToStandardError(false);
view->setSource(testFileUrl("bindingTest.qml"));
@@ -704,6 +708,9 @@ void tst_qquickdesignersupport::testSimpleBindings()
void tst_qquickdesignersupport::testDotProperties()
{
+ if (QTestPrivate::isRunningArmOnX86())
+ QSKIP("Crashes in QEMU. (QTBUG-90869)");
+
QScopedPointer<QQuickView> view(new QQuickView);
view->engine()->setOutputWarningsToStandardError(false);
view->setSource(testFileUrl("bindingTest.qml"));
@@ -733,6 +740,8 @@ void tst_qquickdesignersupport::testDotProperties()
void tst_qquickdesignersupport::testItemReparenting()
{
+ if (QTestPrivate::isRunningArmOnX86())
+ QSKIP("Crashes in QEMU. (QTBUG-90869)");
QScopedPointer<QQuickView> view(new QQuickView);
view->engine()->setOutputWarningsToStandardError(false);