aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/ecmascripttests/ecmascripttests.pro
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-04-17 13:25:12 +0200
committerLars Knoll <lars.knoll@qt.io>2018-05-02 14:20:07 +0000
commitf665c9b25dde5d34f14a47f2aa52f8141bc03fd1 (patch)
tree8c32c1e2eecd96c99d2751fb922951e1d53c857f /tests/auto/qml/ecmascripttests/ecmascripttests.pro
parenteca0b30f22903443ac0ca5a91830a6762c546b43 (diff)
Use the new test runner for the autotest
It's quite a bit faster than the old test runner. Change-Id: If7e59dd175d740f3f702032f4affeff786be8a32 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/ecmascripttests/ecmascripttests.pro')
-rw-r--r--tests/auto/qml/ecmascripttests/ecmascripttests.pro23
1 files changed, 4 insertions, 19 deletions
diff --git a/tests/auto/qml/ecmascripttests/ecmascripttests.pro b/tests/auto/qml/ecmascripttests/ecmascripttests.pro
index 4298b068ca..9c09ee701e 100644
--- a/tests/auto/qml/ecmascripttests/ecmascripttests.pro
+++ b/tests/auto/qml/ecmascripttests/ecmascripttests.pro
@@ -1,28 +1,13 @@
-CONFIG += testcase
-TARGET = tst_ecmascripttests
-QT += testlib
-macos:CONFIG -= app_bundle
-SOURCES += tst_ecmascripttests.cpp
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-TESTSCRIPT=$$PWD/test262.py
-isEmpty(V4CMD): V4CMD = qmljs
-
-# The ES test suite takes approximately 5 mins to run, on a fairly
-# vanilla developer machine, so the default watchdog timer kills the
-# test some of the time. Fix by raising time-out to 400s when
-# invoking tst_ecmascripttests:
-checkenv.name = QTEST_FUNCTION_TIMEOUT
-checkenv.value = 400000
-QT_TOOL_ENV += checkenv
+TEMPLATE = subdirs
+SUBDIRS = testcase.pro qjstest
checkjittarget.target = check-jit
-checkjittarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations
+checkjittarget.commands = qjstest --jit --parallel --with-test-expectations --update-expectations
checkjittarget.depends = all
QMAKE_EXTRA_TARGETS += checkjittarget
checkmothtarget.target = check-interpreter
-checkmothtarget.commands = python $$TESTSCRIPT --command=\"$$V4CMD --interpret\" --parallel --with-test-expectations
+checkmothtarget.commands = qjstest --interpret --parallel --with-test-expectations
checkmothtarget.depends = all
QMAKE_EXTRA_TARGETS += checkmothtarget