1 files changed, 86 insertions, 8 deletions
diff --git a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
index 03c5b18474..11d724f795 100644
--- a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
+++ b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
@@ -1,11 +1,22 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QtTest/QtTest>
-#include <QProcess>
+#include <QFileInfo>
+#include <QJSEngine>
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <QLibraryInfo>
-#include <qjstest/test262runner.h>
+#include <QProcess>
 #include <QtQuickTestUtils/private/qmlutils_p.h>
+#include <QtTest/QtTest>
+
+#include "test262runner.h"
+#include "private/qqmlbuiltinfunctions_p.h"
+#include "private/qv4arraybuffer_p.h"
+#include "private/qv4globalobject_p.h"
+#include "private/qv4script_p.h"
+
+#include <stdio.h>
 
 class tst_EcmaScriptTests : public QQmlDataTest
 {
@@ -40,7 +51,7 @@ static inline bool isNoise(QByteArrayView name)
 #ifdef QT_V4_WANT_ES262_WARNINGS
     return false;
 #else
-    const QByteArrayView noisy("qt.qml.compiler");
+    const QByteArrayView noisy("qt.qml.usedbeforedeclared");
     return name.startsWith(noisy) && (name.size() <= noisy.size() || name[noisy.size()] == '.');
 #endif
 }
@@ -59,7 +70,7 @@ void tst_EcmaScriptTests::filterCategories(QLoggingCategory *category)
 void tst_EcmaScriptTests::initTestCase()
 {
     QQmlDataTest::initTestCase();
-    /* Suppress lcQmlCompiler's "qt.qml.compiler" warnings; we aren't in a
+    /* Suppress lcQmlCompiler's "qt.qml.usedbeforedeclared" warnings; we aren't in a
        position to fix test262's many warnings and they flood messages so we
        didn't get to see actual failures unless we passed -maxwarnings with a
        huge value on the command-line (resulting in huge log output).
@@ -94,7 +105,74 @@ void tst_EcmaScriptTests::runJitted()
     QVERIFY(result);
 }
 
-QTEST_GUILESS_MAIN(tst_EcmaScriptTests)
+//// v RUNNER PROCESS MODE v ////
 
-#include "tst_ecmascripttests.moc"
+void readInput(bool &done, QString &mode, QString &testData, QString &testCasePath,
+               QString &harnessForModules, bool &runAsModule)
+{
+    QTextStream in(stdin);
+    QString input;
+    while (input.isEmpty())
+        input = in.readLine();
+
+    QJsonDocument json = QJsonDocument::fromJson(input.toUtf8());
+    done = json["done"].toBool(false);
+    mode = json["mode"].toString();
+    testData = json["testData"].toString();
+    testCasePath = json["testCasePath"].toString();
+    harnessForModules = json["harnessForModules"].toString();
+    runAsModule = json["runAsModule"].toBool(false);
+}
+
+void printResult(QV4::ExecutionEngine &vm, const QString &mode)
+{
+    QJsonObject result;
+    result.insert("mode", mode);
+    if (vm.hasException) {
+        QV4::Scope scope(&vm);
+        QV4::ScopedValue val(scope, vm.catchException());
+
+        result.insert("resultState", int(TestCase::State::Fails));
+        result.insert("resultErrorMessage", val->toQString());
+    } else {
+        result.insert("resultState", int(TestCase::State::Passes));
+    }
 
+    QTextStream(stdout) << QJsonDocument(result).toJson(QJsonDocument::Compact) << "\r\n";
+}
+
+void doRunnerProcess()
+{
+    bool done = false;
+    QString mode;
+    QString testData;
+    QString testCasePath;
+    QString harnessForModules;
+    bool runAsModule = false;
+
+    while (!done) {
+        QV4::ExecutionEngine vm;
+        readInput(done, mode, testData, testCasePath, harnessForModules, runAsModule);
+        if (done)
+            break;
+        Test262Runner::executeTest(vm, testData, testCasePath, harnessForModules, runAsModule);
+        printResult(vm, mode);
+    }
+}
+
+//// ^ RUNNER PROCESS MODE ^ ////
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    if (qEnvironmentVariableIntValue("runnerProcess") == 1) {
+        doRunnerProcess();
+    } else {
+        tst_EcmaScriptTests tc;
+        QTEST_SET_MAIN_SOURCE_PATH
+        return QTest::qExec(&tc, argc, argv);
+    }
+}
+
+#include "tst_ecmascripttests.moc"