fixup! wpt

Author: avivkeller

test/common/wpt.js

@@ -591,7 +591,11 @@ class WPTRunner {
     this.resource = new ResourceLoader(path);
     this.concurrency = concurrency;
 
-    this.flags = [];
+    // Since we need to prepare the Web Worker APIs
+    // in the harness that runs on all WPT workers,
+    // we enable the API globally. This has no practical
+    // effect on the non-web-worker tests, however.
+    this.flags = ['--experimental-web-worker'];
     this.globalThisInitScripts = [];
     this.initScript = null;
 
@@ -617,7 +621,7 @@ class WPTRunner {
    * @param {string[]} flags
    */
   setFlags(flags) {
-    this.flags = flags;
+    this.flags = this.flags.concat(flags);
   }
 
   /**

test/common/wpt/worker.js

@@ -13,16 +13,14 @@ const { parentPort, workerData } = require('worker_threads');
 const { ResourceLoader } = require(workerData.wptRunner);
 const resource = new ResourceLoader(workerData.wptPath);
 
-if ('Worker' in globalThis) {
-  // Tests create workers with URLs the WPT server would have served them
-  // from; map them into the fixtures directory.
-  const RealWorker = globalThis.Worker;
-  globalThis.Worker = class Worker extends RealWorker {
-    constructor(url, options) {
-      super(resource.mapServerURL(workerData.testRelativePath, url), options);
-    }
-  };
-}
+// Tests create workers with URLs the WPT server would have served them
+// from; map them into the fixtures directory.
+const RealWorker = globalThis.Worker;
+globalThis.Worker = class Worker extends RealWorker {
+  constructor(url, options) {
+    super(resource.mapServerURL(workerData.testRelativePath, url), options);
+  }
+};
 
 if (workerData.needsGc) {
   // See https://github.com/nodejs/node/issues/16595#issuecomment-340288680