From 55407b826f617d2755595785072d175851a016f7 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Wed, 20 Jan 2021 18:01:21 -0500 Subject: [PATCH] test: update to improve terminology Update common section in wpt to incorporate improved terminology fixed upstream in https://github.com/web-platform-tests/wpt/pull/27152 Signed-off-by: Michael Dawson PR-URL: https://github.com/nodejs/node/pull/37011 Reviewed-By: Milad Fa Reviewed-By: Joyee Cheung Reviewed-By: Daniel Bevenius Reviewed-By: Rich Trott Reviewed-By: Luigi Pinca --- test/fixtures/wpt/README.md | 2 +- test/fixtures/wpt/common/sab.js | 3 +++ test/fixtures/wpt/common/security-features/README.md | 4 ++-- test/fixtures/wpt/versions.json | 2 +- test/wpt/status/encoding.json | 9 ++++++++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/test/fixtures/wpt/README.md b/test/fixtures/wpt/README.md index 4a5d73c742acea..1bcebbec49ff7d 100644 --- a/test/fixtures/wpt/README.md +++ b/test/fixtures/wpt/README.md @@ -18,7 +18,7 @@ Last update: - html/webappapis/microtask-queuing: https://github.com/web-platform-tests/wpt/tree/2c5c3c4c27/html/webappapis/microtask-queuing - html/webappapis/timers: https://github.com/web-platform-tests/wpt/tree/264f12bc7b/html/webappapis/timers - hr-time: https://github.com/web-platform-tests/wpt/tree/a5d1774ecf/hr-time -- common: https://github.com/web-platform-tests/wpt/tree/4dacb6e2ff/common +- common: https://github.com/web-platform-tests/wpt/tree/841a51412f/common - dom/abort: https://github.com/web-platform-tests/wpt/tree/7caa3de747/dom/abort - FileAPI: https://github.com/web-platform-tests/wpt/tree/d9d921b8f9/FileAPI diff --git a/test/fixtures/wpt/common/sab.js b/test/fixtures/wpt/common/sab.js index c7fd1a742e64f6..d40dd7cca8da10 100644 --- a/test/fixtures/wpt/common/sab.js +++ b/test/fixtures/wpt/common/sab.js @@ -5,6 +5,9 @@ const createBuffer = (() => { if (type === "ArrayBuffer") { return new ArrayBuffer(length); } else if (type === "SharedArrayBuffer") { + if (sabConstructor.name !== "SharedArrayBuffer") { + throw new Error("WebAssembly.Memory does not support shared:true"); + } return new sabConstructor(length); } else { throw new Error("type has to be ArrayBuffer or SharedArrayBuffer"); diff --git a/test/fixtures/wpt/common/security-features/README.md b/test/fixtures/wpt/common/security-features/README.md index fb9a2f108f9faf..f957541f75ecc3 100644 --- a/test/fixtures/wpt/common/security-features/README.md +++ b/test/fixtures/wpt/common/security-features/README.md @@ -278,9 +278,9 @@ The ```excluded_tests``` section have objects with the same format as [Test Expa Taking the spec JSON, the generator follows this algorithm: -* Expand all ```excluded_tests``` to create a blacklist of selections +* Expand all ```excluded_tests``` to create a denylist of selections -* For each `specification` entries: Expand the ```test_expansion``` pattern into selections and check each against the blacklist, if not marked as suppresed, generate the test resources for the selection +* For each `specification` entries: Expand the ```test_expansion``` pattern into selections and check each against the denylist, if not marked as suppresed, generate the test resources for the selection ### SourceContext Resolution diff --git a/test/fixtures/wpt/versions.json b/test/fixtures/wpt/versions.json index 20fed894db94b6..31d7041697db26 100644 --- a/test/fixtures/wpt/versions.json +++ b/test/fixtures/wpt/versions.json @@ -32,7 +32,7 @@ "path": "hr-time" }, "common": { - "commit": "4dacb6e2ff8dbabbe328fde2d8c75491598e4c10", + "commit": "841a51412f236ad63655daca843d3b8e83e0777b", "path": "common" }, "dom/abort": { diff --git a/test/wpt/status/encoding.json b/test/wpt/status/encoding.json index 545a887ef351f6..0b2c84051d0e1b 100644 --- a/test/wpt/status/encoding.json +++ b/test/wpt/status/encoding.json @@ -15,7 +15,8 @@ "requires": ["small-icu"] }, "textdecoder-streaming.any.js": { - "requires": ["small-icu"] + "requires": ["small-icu"], + "fail": "WebAssembly.Memory does not support shared:true" }, "textdecoder-utf16-surrogates.any.js": { "requires": ["small-icu"] @@ -50,5 +51,11 @@ }, "streams/*.js": { "fail": "No implementation of TextDecoderStream and TextEncoderStream" + }, + "encodeInto.any.js": { + "fail": "WebAssembly.Memory does not support shared:true" + }, + "textdecoder-copy.any.js": { + "fail": "WebAssembly.Memory does not support shared:true" } }