aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2018-06-18 15:41:22 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2018-07-02 10:42:36 +0000
commite6d19ae5cf697087bbecce9d6f702afef7c29253 (patch)
tree2c259dc3526ae0d7b76fd2dd70ba46a79b50e236 /tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
parent090b0978f3546a10784992c3e4b1eb40427e0353 (diff)
Fix running the ES test suite
When we have one or more failures, make sure that the auto-test fails. This produces a few additional failures but oddly also "fixes" some tests that are marked as expected failure. Change-Id: I0bbbed463b326336ab9caa33f434520c90ed36de Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp')
-rw-r--r--tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
index 27d2822762..418dd4dc53 100644
--- a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
+++ b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
@@ -43,7 +43,7 @@ private slots:
void tst_EcmaScriptTests::runInterpreted()
{
-#if defined(Q_PROCESSOR_X86_64)
+#if defined(Q_PROCESSOR_X86_64) && !defined(Q_OS_DARWIN)
QDir::setCurrent(QLatin1String(SRCDIR));
Test262Runner runner(QString(), "test262");
runner.setFlags(Test262Runner::ForceBytecode|Test262Runner::WithTestExpectations|Test262Runner::Parallel|Test262Runner::Verbose);
@@ -54,7 +54,7 @@ void tst_EcmaScriptTests::runInterpreted()
void tst_EcmaScriptTests::runJitted()
{
-#if defined(Q_PROCESSOR_X86_64)
+#if defined(Q_PROCESSOR_X86_64) && !defined(Q_OS_DARWIN)
QDir::setCurrent(QLatin1String(SRCDIR));
Test262Runner runner(QString(), "test262");
runner.setFlags(Test262Runner::ForceJIT|Test262Runner::WithTestExpectations|Test262Runner::Parallel|Test262Runner::Verbose);