Enable running module tests

They all fail right now (unless pass by accident).

Change-Id: I0a64bd29459ef32f555614a1decea3419bd44170
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 127 insertions, 2 deletions

diff --git a/tests/auto/qml/ecmascripttests/TestExpectations b/tests/auto/qml/ecmascripttests/TestExpectations
index a4115e60b3..2ea3678766 100644
--- a/tests/auto/qml/ecmascripttests/TestExpectations
+++ b/tests/auto/qml/ecmascripttests/TestExpectations
@@ -2327,6 +2327,123 @@ language/literals/regexp/u-surrogate-pairs-atom-escape-decimal.js fails
 language/literals/regexp/u-surrogate-pairs.js fails
 language/literals/regexp/u-unicode-esc.js fails
 language/literals/regexp/y-assertion-start.js fails
+language/module-code/eval-export-cls-semi.js strictFails
+language/module-code/eval-export-dflt-cls-anon-semi.js strictFails
+language/module-code/eval-export-dflt-cls-anon.js strictFails
+language/module-code/eval-export-dflt-cls-name-meth.js strictFails
+language/module-code/eval-export-dflt-cls-named-semi.js strictFails
+language/module-code/eval-export-dflt-cls-named.js strictFails
+language/module-code/eval-export-dflt-expr-cls-anon.js strictFails
+language/module-code/eval-export-dflt-expr-cls-name-meth.js strictFails
+language/module-code/eval-export-dflt-expr-cls-named.js strictFails
+language/module-code/eval-export-dflt-expr-fn-anon.js strictFails
+language/module-code/eval-export-dflt-expr-fn-named.js strictFails
+language/module-code/eval-export-dflt-expr-gen-anon.js strictFails
+language/module-code/eval-export-dflt-expr-gen-named.js strictFails
+language/module-code/eval-export-dflt-expr-in.js strictFails
+language/module-code/eval-export-dflt-fun-anon-semi.js strictFails
+language/module-code/eval-export-dflt-fun-named-semi.js strictFails
+language/module-code/eval-export-dflt-gen-anon-semi.js strictFails
+language/module-code/eval-export-dflt-gen-named-semi.js strictFails
+language/module-code/eval-export-fun-semi.js strictFails
+language/module-code/eval-export-gen-semi.js strictFails
+language/module-code/eval-gtbndng-indirect-trlng-comma.js strictFails
+language/module-code/eval-gtbndng-indirect-update-as.js strictFails
+language/module-code/eval-gtbndng-indirect-update-dflt.js strictFails
+language/module-code/eval-gtbndng-indirect-update.js strictFails
+language/module-code/eval-rqstd-once.js strictFails
+language/module-code/eval-rqstd-order.js strictFails
+language/module-code/eval-self-once.js strictFails
+language/module-code/eval-this.js strictFails
+language/module-code/instn-iee-bndng-cls.js strictFails
+language/module-code/instn-iee-bndng-const.js strictFails
+language/module-code/instn-iee-bndng-fun.js strictFails
+language/module-code/instn-iee-bndng-gen.js strictFails
+language/module-code/instn-iee-bndng-let.js strictFails
+language/module-code/instn-iee-bndng-var.js strictFails
+language/module-code/instn-iee-iee-cycle.js strictFails
+language/module-code/instn-iee-star-cycle.js strictFails
+language/module-code/instn-iee-trlng-comma.js strictFails
+language/module-code/instn-local-bndng-cls.js strictFails
+language/module-code/instn-local-bndng-const.js strictFails
+language/module-code/instn-local-bndng-export-cls.js strictFails
+language/module-code/instn-local-bndng-export-const.js strictFails
+language/module-code/instn-local-bndng-export-fun.js strictFails
+language/module-code/instn-local-bndng-export-gen.js strictFails
+language/module-code/instn-local-bndng-export-let.js strictFails
+language/module-code/instn-local-bndng-export-var.js strictFails
+language/module-code/instn-local-bndng-for.js strictFails
+language/module-code/instn-local-bndng-fun.js strictFails
+language/module-code/instn-local-bndng-gen.js strictFails
+language/module-code/instn-local-bndng-let.js strictFails
+language/module-code/instn-local-bndng-var.js strictFails
+language/module-code/instn-named-bndng-cls.js strictFails
+language/module-code/instn-named-bndng-const.js strictFails
+language/module-code/instn-named-bndng-dflt-cls.js strictFails
+language/module-code/instn-named-bndng-dflt-expr.js strictFails
+language/module-code/instn-named-bndng-dflt-fun-anon.js strictFails
+language/module-code/instn-named-bndng-dflt-fun-named.js strictFails
+language/module-code/instn-named-bndng-dflt-gen-anon.js strictFails
+language/module-code/instn-named-bndng-dflt-gen-named.js strictFails
+language/module-code/instn-named-bndng-dflt-named.js strictFails
+language/module-code/instn-named-bndng-dflt-star.js strictFails
+language/module-code/instn-named-bndng-fun.js strictFails
+language/module-code/instn-named-bndng-gen.js strictFails
+language/module-code/instn-named-bndng-let.js strictFails
+language/module-code/instn-named-bndng-trlng-comma.js strictFails
+language/module-code/instn-named-bndng-var.js strictFails
+language/module-code/instn-named-id-name.js strictFails
+language/module-code/instn-named-iee-cycle.js strictFails
+language/module-code/instn-named-star-cycle.js strictFails
+language/module-code/instn-once.js strictFails
+language/module-code/instn-same-global.js strictFails
+language/module-code/instn-star-ambiguous.js strictFails
+language/module-code/instn-star-binding.js strictFails
+language/module-code/instn-star-equality.js strictFails
+language/module-code/instn-star-id-name.js strictFails
+language/module-code/instn-star-iee-cycle.js strictFails
+language/module-code/instn-star-props-circular.js strictFails
+language/module-code/instn-star-props-dflt-keep-indirect.js strictFails
+language/module-code/instn-star-props-dflt-keep-local.js strictFails
+language/module-code/instn-star-props-dflt-skip.js strictFails
+language/module-code/instn-star-props-nrml.js strictFails
+language/module-code/instn-star-star-cycle.js strictFails
+language/module-code/instn-uniq-env-rec.js strictFails
+language/module-code/namespace/Symbol.iterator.js strictFails
+language/module-code/namespace/Symbol.toStringTag.js strictFails
+language/module-code/namespace/internals/define-own-property.js strictFails
+language/module-code/namespace/internals/delete-exported-init.js strictFails
+language/module-code/namespace/internals/delete-exported-uninit.js strictFails
+language/module-code/namespace/internals/delete-non-exported.js strictFails
+language/module-code/namespace/internals/enumerate-binding-uninit.js strictFails
+language/module-code/namespace/internals/get-own-property-str-found-init.js strictFails
+language/module-code/namespace/internals/get-own-property-str-found-uninit.js strictFails
+language/module-code/namespace/internals/get-own-property-str-not-found.js strictFails
+language/module-code/namespace/internals/get-own-property-sym.js strictFails
+language/module-code/namespace/internals/get-prototype-of.js strictFails
+language/module-code/namespace/internals/get-str-found-init.js strictFails
+language/module-code/namespace/internals/get-str-found-uninit.js strictFails
+language/module-code/namespace/internals/get-str-initialize.js strictFails
+language/module-code/namespace/internals/get-str-not-found.js strictFails
+language/module-code/namespace/internals/get-str-update.js strictFails
+language/module-code/namespace/internals/get-sym-found.js strictFails
+language/module-code/namespace/internals/get-sym-not-found.js strictFails
+language/module-code/namespace/internals/has-property-str-found-init.js strictFails
+language/module-code/namespace/internals/has-property-str-found-uninit.js strictFails
+language/module-code/namespace/internals/has-property-str-not-found.js strictFails
+language/module-code/namespace/internals/has-property-sym-found.js strictFails
+language/module-code/namespace/internals/has-property-sym-not-found.js strictFails
+language/module-code/namespace/internals/is-extensible.js strictFails
+language/module-code/namespace/internals/object-hasOwnProperty-binding-uninit.js strictFails
+language/module-code/namespace/internals/object-keys-binding-uninit.js strictFails
+language/module-code/namespace/internals/object-propertyIsEnumerable-binding-uninit.js strictFails
+language/module-code/namespace/internals/own-property-keys-binding-types.js strictFails
+language/module-code/namespace/internals/own-property-keys-sort.js strictFails
+language/module-code/namespace/internals/prevent-extensions.js strictFails
+language/module-code/namespace/internals/set-prototype-of-null.js strictFails
+language/module-code/namespace/internals/set-prototype-of.js strictFails
+language/module-code/namespace/internals/set.js strictFails
+language/module-code/parse-export-empty.js strictFails
 language/statements/async-function/cptn-decl.js fails
 language/statements/async-function/declaration-returns-promise.js fails
 language/statements/async-function/evaluation-body.js fails
diff --git a/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp b/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp
index 989c4e08a2..4fa7137820 100644
--- a/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp
+++ b/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp
@@ -498,7 +498,10 @@ void SingleTest::run()
         data.sloppyResult = TestCase::Skipped;
     }
     if (data.runInStrictMode) {
-        QByteArray c = "'use strict';\n" + data.content;
+        QByteArray c = data.content;
+        // modules are strict by default.
+        if (!data.runAsModuleCode)
+            c.prepend("'use strict';\n");
         bool ok = ::executeTest(c);
         if (data.negative)
             ok = !ok;
@@ -550,7 +553,7 @@ int Test262Runner::runSingleTest(TestCase testCase)
     TestData data = getTestData(testCase);
 //    qDebug() << "starting test" << data.test;
 
-    if (data.isExcluded || data.async || data.runAsModuleCode)
+    if (data.isExcluded || data.async)
         return 0;
 
     if (threadPool) {
@@ -728,6 +731,11 @@ void Test262Runner::parseYaml(const QByteArray &content, TestData *data)
     data->runAsModuleCode = flags.contains("module");
     data->async = flags.contains("async");
 
+    if (data->runAsModuleCode) {
+        data->runInStrictMode = true;
+        data->runInSloppyMode = false;
+    }
+
     YamlSection includes(yaml, "includes:");
     data->includes = includes.keywords();