From d128b0c38ab036e858840699adfbe5cf746997c6 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 4 Jul 2017 15:25:25 +0200 Subject: Fix the runner for test262 Change-Id: Ie292bae849abf1f2d5bd2da3f7cc913dd66a7bef Reviewed-by: Lars Knoll --- tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'tests/auto/qml/ecmascripttests') diff --git a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp index 880e254543..18fca85f3f 100644 --- a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp +++ b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp @@ -35,28 +35,16 @@ class tst_EcmaScriptTests : public QObject { Q_OBJECT private slots: - void runTests_data(); void runTests(); }; -void tst_EcmaScriptTests::runTests_data() -{ - QTest::addColumn("qmljsParameter"); - - QTest::newRow("jit") << QStringLiteral("--jit"); - QTest::newRow("interpreter") << QStringLiteral("--interpret"); -} - void tst_EcmaScriptTests::runTests() { -#if defined(Q_OS_LINUX) && defined(Q_PROCESSOR_X86_64) - QFETCH(QString, qmljsParameter); - QProcess process; process.setProcessChannelMode(QProcess::ForwardedChannels); process.setWorkingDirectory(QLatin1String(SRCDIR)); process.setProgram("python"); - process.setArguments(QStringList() << "test262.py" << "--command=" + QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmljs " + qmljsParameter << "--parallel" << "--with-test-expectations"); + process.setArguments(QStringList() << "test262.py" << "--command=" + QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmljs" << "--parallel" << "--with-test-expectations"); qDebug() << "Going to run" << process.program() << process.arguments() << "in" << process.workingDirectory(); -- cgit v1.2.3 From 1898d254bc26404cb191581158a3b879e2ef614a Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 4 Jul 2017 15:37:20 +0200 Subject: Fix the fix to get test262 running Change-Id: I96d4200c452fcb05bf25e7a0f24ebd90eddc509e Reviewed-by: Lars Knoll --- tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/qml/ecmascripttests') diff --git a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp index 18fca85f3f..4303aec2a7 100644 --- a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp +++ b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp @@ -40,6 +40,7 @@ private slots: void tst_EcmaScriptTests::runTests() { +#if defined(Q_OS_LINUX) && defined(Q_PROCESSOR_X86_64) QProcess process; process.setProcessChannelMode(QProcess::ForwardedChannels); process.setWorkingDirectory(QLatin1String(SRCDIR)); -- cgit v1.2.3 From 6f784bee61e7a2817a23f41c39961f4f17371c54 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Fri, 7 Jul 2017 13:54:30 +0200 Subject: Update ecmascript conformance test expectations Test 10.4.3-1-106 no longer fails for us. Change-Id: Ib2a3ba5b1dfb680131ff4a545132564e142b706d Reviewed-by: Simon Hausmann --- tests/auto/qml/ecmascripttests/TestExpectations | 1 - 1 file changed, 1 deletion(-) (limited to 'tests/auto/qml/ecmascripttests') diff --git a/tests/auto/qml/ecmascripttests/TestExpectations b/tests/auto/qml/ecmascripttests/TestExpectations index 27498de473..589f25d174 100644 --- a/tests/auto/qml/ecmascripttests/TestExpectations +++ b/tests/auto/qml/ecmascripttests/TestExpectations @@ -15,7 +15,6 @@ S15.1.2.3_A2_T10 15.5.4.20-3-5 15.5.4.20-3-6 -10.4.3-1-106 failing 11.2.3-3_3 failing S13_A15_T4 failing S15.4.4.3_A1_T1 failing -- cgit v1.2.3