Merge pull request #5792 from cloudflare/yagiz/include-wpt-common

include common folder for web-platform tests

Author: anonrig

build/wpt_test.bzl

@@ -38,6 +38,7 @@ def wpt_test(name, wpt_directory, config, compat_date = "", compat_flags = [], a
     wpt_tsproject = "//src/wpt:wpt-all@tsproject"
     harness = "//src/wpt:harness@js"
     wpt_cacert = "@wpt//:tools/certs/cacert.pem"
+    wpt_common = "@wpt//:common@module"
 
     if compat_date == "":
         compat_date = "2999-12-31"
@@ -60,6 +61,7 @@ def wpt_test(name, wpt_directory, config, compat_date = "", compat_flags = [], a
         harness = harness,
         autogates = autogates,
         wpt_cacert = wpt_cacert,
+        wpt_common = wpt_common,
         compat_flags = compat_flags + ["experimental", "nodejs_compat", "unsupported_process_actual_platform"],
     )
 
@@ -69,6 +71,7 @@ def wpt_test(name, wpt_directory, config, compat_date = "", compat_flags = [], a
         wpt_directory,  # e.g. wpt/url/**",
         harness,  # e.g. wpt/harness/*.ts
         wpt_cacert,  # i.e. "wpt/tools/certs/cacert.pem",
+        wpt_common,  # i.e. "wpt/common/**"
     ]
 
     wd_test(
@@ -228,13 +231,18 @@ def _wpt_wd_test_gen_impl(ctx):
     src = ctx.actions.declare_file("{}.wd-test".format(ctx.attr.test_name))
     base = ctx.attr.wpt_directory[WPTModuleInfo].base
 
+    # Generate bindings for test directory files plus common/**/*.js
+    bindings = generate_external_bindings(src, base, ctx.attr.wpt_directory.files)
+    common_base = ctx.attr.wpt_common[WPTModuleInfo].base
+    common_bindings = generate_common_bindings(src, common_base, ctx.attr.wpt_common.files)
+    all_bindings = bindings + ",\n" + common_bindings if bindings and common_bindings else (bindings or common_bindings)
     ctx.actions.write(
         output = src,
         content = WPT_WD_TEST_TEMPLATE.format(
             test_name = ctx.attr.test_name,
             test_config = ctx.file.test_config.basename,
             test_js_generated = ctx.file.test_js_generated.basename,
-            bindings = generate_external_bindings(src, base, ctx.attr.wpt_directory.files),
+            bindings = all_bindings,
             harness_modules = generate_harness_modules(src, ctx.attr.harness.files),
             wpt_cacert = wd_test_relative_path(src, ctx.file.wpt_cacert),
             autogates = generate_autogates_field(ctx.attr.autogates),
@@ -261,6 +269,8 @@ _wpt_wd_test_gen = rule(
         "harness": attr.label(),
         # Target specifying the location of the WPT CA certificate
         "wpt_cacert": attr.label(allow_single_file = True),
+        # Target specifying the WPT common directory module
+        "wpt_common": attr.label(),
         # A list of autogates to specify in the generated wd-test file
         "autogates": attr.string_list(),
         # A list of compatibility flags to specify in the generated wd-test file
@@ -357,6 +367,29 @@ def generate_external_bindings(wd_test_file, base, files):
 
     return ",\n".join(result)
 
+def generate_common_bindings(wd_test_file, base, files):
+    """
+    Generates appropriate bindings for each file in the WPT common module.
+    Files are prefixed with /common/ path.
+
+    Only JS files are included as some JSON files in common/ contain
+    non-standard JSON (e.g., with comments) that would cause parsing errors.
+    """
+
+    result = []
+
+    for file in files.to_list():
+        if file.extension == "js":
+            binding_type = "text"
+        else:
+            # Skip non-JS files to avoid issues with non-standard JSON
+            continue
+
+        relative_path = module_relative_path(base, file)
+        result.append('(name = "/common/{}", {} = embed "{}")'.format(relative_path, binding_type, wd_test_relative_path(wd_test_file, file)))
+
+    return ",\n".join(result)
+
 def generate_harness_modules(wd_test_file, files):
     """
     Generates a module entry for each file in the harness package

src/wpt/harness/harness.ts

@@ -295,7 +295,6 @@ const EXCLUDED_PATHS = new Set([
   '/resources/utils.js',
   '/common/utils.js',
   '/common/get-host-info.sub.js',
-  '/common/gc.js',
   '/common/sab.js',
 ]);
 

src/wpt/harness/utils.ts

@@ -58,7 +58,8 @@ declare global {
   function token(): string;
   function setup(func: UnknownFunc | Record<string, unknown>): void;
   function add_completion_callback(func: UnknownFunc): void;
-  function garbageCollect(): void;
+  // Provided by /common/gc.js
+  function garbageCollect(): Promise<void>;
   function format_value(val: unknown): string;
   function createBuffer(
     type: 'ArrayBuffer' | 'SharedArrayBuffer',
@@ -139,12 +140,6 @@ globalThis.add_completion_callback = (func: UnknownFunc): void => {
   globalThis.state.completionCallbacks.push(func);
 };
 
-globalThis.garbageCollect = (): void => {
-  if (typeof gc === 'function') {
-    gc();
-  }
-};
-
 globalThis.format_value = (val): string => {
   return JSON.stringify(val, null, 2);
 };