aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2021-05-04 13:10:33 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2021-05-04 22:07:06 +0200
commitc04cec25c31917b4373db833cca079e39c7d036c (patch)
tree3328f75c11f6d21527c01f7fa0bb75c732e22671 /tests
parentbb644bf8a8116930650b56505b66be11b2aa21e4 (diff)
Blacklist and fix failing tests on ARM macOS
Task-number: QTQAINFRA-4431 Change-Id: I478128b9e7b45d5027e5d3d5ce388e5fc47587e3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/qqmlecmascript/BLACKLIST2
-rw-r--r--tests/auto/qml/qv4assembler/tst_qv4assembler.cpp3
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlecmascript/BLACKLIST b/tests/auto/qml/qqmlecmascript/BLACKLIST
new file mode 100644
index 0000000000..bd25566eef
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/BLACKLIST
@@ -0,0 +1,2 @@
+[gcCrashRegressionTest]
+macos arm
diff --git a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
index 0e8cedb20b..d6bee0c96c 100644
--- a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
+++ b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
@@ -148,6 +148,9 @@ void tst_QV4Assembler::jitEnabled()
#elif defined(Q_OS_WIN) && defined(Q_PROCESSOR_ARM)
/* JIT should be disabled Windows on ARM/ARM64 for now. */
QVERIFY(!QT_CONFIG(qml_jit));
+#elif defined(Q_OS_MACOS) && defined(Q_PROCESSOR_ARM)
+ /* JIT should be disabled on macOS on ARM/ARM64 for now. */
+ QVERIFY(!QT_CONFIG(qml_jit));
#else
/* JIT should be enabled on all other architectures/OSes tested in CI. */
QVERIFY(QT_CONFIG(qml_jit));