From 1f7948aa7e095d4ec72dfd997ce52ffaabaf16cf Mon Sep 17 00:00:00 2001 From: test262-automation Date: Mon, 10 Sep 2018 18:23:31 +0000 Subject: [PATCH] [javascriptcore-test262-automation] Changes from https://github.com/webkit/webkit.git at sha 8a73712b6a on Mon Sep 10 2018 18:21:05 GMT+0000 (Coordinated Universal Time) --- .../curation_logs/javascriptcore.json | 4 ++- .../javascriptcore/modules/different-view.js | 10 +++---- .../modules/fallback-ambiguous.js | 9 ++++--- .../javascriptcore/modules/import-error.js | 27 ++++++++++--------- .../modules/indirect-export-error.js | 26 ++++++++++-------- .../javascriptcore/modules/namespace-error.js | 8 +++--- 6 files changed, 46 insertions(+), 38 deletions(-) diff --git a/implementation-contributed/curation_logs/javascriptcore.json b/implementation-contributed/curation_logs/javascriptcore.json index 1ca4ce25d1..203247eeb1 100644 --- a/implementation-contributed/curation_logs/javascriptcore.json +++ b/implementation-contributed/curation_logs/javascriptcore.json @@ -1643,6 +1643,8 @@ "/stress/yield-named-variable.js": "DELETED_IN_TARGET", "/stress/yield-out-of-generator.js": "DELETED_IN_TARGET", "/stress/yield-reserved-word.js": "DELETED_IN_TARGET", - "/stress/yield-star-throw-continue.js": "DELETED_IN_TARGET" + "/stress/yield-star-throw-continue.js": "DELETED_IN_TARGET", + "/stress/regress-189186.js": "DELETED_IN_TARGET", + "/stress/regress-189292.js": "DELETED_IN_TARGET" } } \ No newline at end of file diff --git a/implementation-contributed/javascriptcore/modules/different-view.js b/implementation-contributed/javascriptcore/modules/different-view.js index f81e89c25f..c38b52ba21 100644 --- a/implementation-contributed/javascriptcore/modules/different-view.js +++ b/implementation-contributed/javascriptcore/modules/different-view.js @@ -1,7 +1,5 @@ -import { shouldBe, shouldThrow } from "./resources/assert.js" - -shouldThrow(() => { - loadModule('./different-view/main.js'); -}, `SyntaxError: Importing binding name 'A' cannot be resolved due to ambiguous multiple bindings.`); - +import { shouldBe } from "./resources/assert.js" +import('./different-view/main.js').then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Importing binding name 'A' cannot be resolved due to ambiguous multiple bindings.`); +}).catch($vm.abort); diff --git a/implementation-contributed/javascriptcore/modules/fallback-ambiguous.js b/implementation-contributed/javascriptcore/modules/fallback-ambiguous.js index 36b60fe4d7..210ffcd3e3 100644 --- a/implementation-contributed/javascriptcore/modules/fallback-ambiguous.js +++ b/implementation-contributed/javascriptcore/modules/fallback-ambiguous.js @@ -6,7 +6,8 @@ // | | // v @ // (B) -import { shouldThrow } from "./resources/assert.js" -shouldThrow(() => { - loadModule("./fallback-ambiguous/main.js"); -}, `SyntaxError: Indirectly exported binding name 'A' cannot be resolved due to ambiguous multiple bindings.`); +import { shouldBe } from "./resources/assert.js" + +import('./fallback-ambiguous/main.js').then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'A' cannot be resolved due to ambiguous multiple bindings.`); +}).catch($vm.abort); diff --git a/implementation-contributed/javascriptcore/modules/import-error.js b/implementation-contributed/javascriptcore/modules/import-error.js index 0237472ccf..3b86812e1c 100644 --- a/implementation-contributed/javascriptcore/modules/import-error.js +++ b/implementation-contributed/javascriptcore/modules/import-error.js @@ -1,13 +1,16 @@ -import { shouldBe, shouldThrow } from "./resources/assert.js" +import { shouldBe } from "./resources/assert.js" -shouldThrow(() => { - loadModule('./import-error/import-not-found.js'); -}, `SyntaxError: Importing binding name 'B' is not found.`); - -shouldThrow(() => { - loadModule('./import-error/import-ambiguous.js'); -}, `SyntaxError: Importing binding name 'B' cannot be resolved due to ambiguous multiple bindings.`); - -shouldThrow(() => { - loadModule('./import-error/import-default-from-star.js'); -}, `SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.`); +Promise.all([ + import('./import-error/import-not-found.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Importing binding name 'B' is not found.`); + }).catch($vm.abort), + import('./import-error/import-ambiguous.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Importing binding name 'B' cannot be resolved due to ambiguous multiple bindings.`); + }).catch($vm.abort), + import('./import-error/import-default-from-star.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.`); + }).catch($vm.abort), +]).catch($vm.abort); diff --git a/implementation-contributed/javascriptcore/modules/indirect-export-error.js b/implementation-contributed/javascriptcore/modules/indirect-export-error.js index a3cfc77d4f..41dbebd307 100644 --- a/implementation-contributed/javascriptcore/modules/indirect-export-error.js +++ b/implementation-contributed/javascriptcore/modules/indirect-export-error.js @@ -1,13 +1,17 @@ -import { shouldBe, shouldThrow } from "./resources/assert.js" +import { shouldBe } from "./resources/assert.js" -shouldThrow(() => { - loadModule('./indirect-export-error/indirect-export-not-found.js'); -}, `SyntaxError: Indirectly exported binding name 'B' is not found.`); -shouldThrow(() => { - loadModule('./indirect-export-error/indirect-export-ambiguous.js'); -}, `SyntaxError: Indirectly exported binding name 'B' cannot be resolved due to ambiguous multiple bindings.`); - -shouldThrow(() => { - loadModule('./indirect-export-error/indirect-export-default.js'); -}, `SyntaxError: Indirectly exported binding name 'default' cannot be resolved by star export entries.`); +Promise.all([ + import('./indirect-export-error/indirect-export-not-found.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'B' is not found.`); + }).catch($vm.abort), + import('./indirect-export-error/indirect-export-ambiguous.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'B' cannot be resolved due to ambiguous multiple bindings.`); + }).catch($vm.abort), + import('./indirect-export-error/indirect-export-default.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'default' cannot be resolved by star export entries.`); + }).catch($vm.abort), +]).catch($vm.abort); diff --git a/implementation-contributed/javascriptcore/modules/namespace-error.js b/implementation-contributed/javascriptcore/modules/namespace-error.js index e47817a7b0..6d6a9eda26 100644 --- a/implementation-contributed/javascriptcore/modules/namespace-error.js +++ b/implementation-contributed/javascriptcore/modules/namespace-error.js @@ -1,5 +1,5 @@ -import { shouldThrow } from "./resources/assert.js" +import { shouldBe } from "./resources/assert.js" -shouldThrow(() => { - loadModule('./namespace-error/namespace-local-error-should-hide-global-ambiguity.js'); -}, `SyntaxError: Indirectly exported binding name 'default' cannot be resolved by star export entries.`); +import('./namespace-error/namespace-local-error-should-hide-global-ambiguity.js').then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'default' cannot be resolved by star export entries.`); +}).catch($vm.abort);