Revert "test: run WPT files in parallel again"

This reverts commit c05689e.
PR-URL: #47627
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Matthew Aitken <maitken033380023@gmail.com>

Author: panva

Makefile

@@ -593,7 +593,6 @@ test-wpt-report:
 $(RM) -r out/wpt
 	mkdir -p out/wpt
 	WPT_REPORT=1 $(PYTHON) tools/test.py --shell $(NODE)$(PARALLEL_ARGS) wpt
-$(NODE)"$$PWD/tools/merge-wpt-reports.mjs"
 
 .PHONY: test-internet
 test-internet: all

test/common/wpt.js

@@ -10,8 +10,6 @@ const os = require('os');
 const{ inspect }=require('util');
 const{ Worker }=require('worker_threads');
 
-constworkerPath=path.join(__dirname,'wpt/worker.js');
-
 functiongetBrowserProperties(){
 const{node: version}=process.versions;// e.g. 18.13.0, 20.0.0-nightly202302078e6e215481
 constrelease=/^\d+\.\d+\.\d+$/.test(version);
@@ -59,8 +57,7 @@ function codeUnitStr(char) {
 }
 
 classWPTReport{
-constructor(path){
-this.filename=`report-${path.replaceAll('/','-')}.json`;
+constructor(){
 this.results=[];
 this.time_start=Date.now();
 }
@@ -99,18 +96,26 @@ class WPTReport {
 returnresult;
 });
 
-/**
- * Return required and some optional properties
- * https://github.com/web-platform-tests/wpt.fyi/blob/60da175/api/README.md?plain=1#L331-L335
- */
-this.run_info={
-product: 'node.js',
- ...getBrowserProperties(),
-revision: process.env.WPT_REVISION||'unknown',
-os: getOs(),
-};
+if(fs.existsSync('out/wpt/wptreport.json')){
+constprev=JSON.parse(fs.readFileSync('out/wpt/wptreport.json'));
+this.results=[...prev.results, ...this.results];
+this.time_start=prev.time_start;
+this.time_end=Math.max(this.time_end,prev.time_end);
+this.run_info=prev.run_info;
+}else{
+/**
+ * Return required and some optional properties
+ * https://github.com/web-platform-tests/wpt.fyi/blob/60da175/api/README.md?plain=1#L331-L335
+ */
+this.run_info={
+product: 'node.js',
+ ...getBrowserProperties(),
+revision: process.env.WPT_REVISION||'unknown',
+os: getOs(),
+};
+}
 
-fs.writeFileSync(`out/wpt/${this.filename}`,JSON.stringify(this));
+fs.writeFileSync('out/wpt/wptreport.json',JSON.stringify(this));
 }
 }
 
@@ -397,29 +402,6 @@ const kIncomplete = 'incomplete';
 constkUncaught='uncaught';
 constNODE_UNCAUGHT=100;
 
-constlimit=(concurrency)=>{
-letrunning=0;
-constqueue=[];
-
-constexecute=async(fn)=>{
-if(running<concurrency){
-running++;
-try{
-awaitfn();
-}finally{
-running--;
-if(queue.length>0){
-execute(queue.shift());
-}
-}
-}else{
-queue.push(fn);
-}
-};
-
-returnexecute;
-};
-
 classWPTRunner{
 constructor(path){
 this.path=path;
@@ -443,7 +425,7 @@ class WPTRunner {
 this.scriptsModifier=null;
 
 if(process.env.WPT_REPORT!=null){
-this.report=newWPTReport(path);
+this.report=newWPTReport();
 }
 }
 
@@ -561,8 +543,6 @@ class WPTRunner {
 
 this.inProgress=newSet(queue.map((spec)=>spec.filename));
 
-construn=limit(os.availableParallelism());
-
 for(constspecofqueue){
 consttestFileName=spec.filename;
 constcontent=spec.getContent();
@@ -596,7 +576,15 @@ class WPTRunner {
 this.scriptsModifier?.(obj);
 scriptsToRun.push(obj);
 
-construnWorker=async(variant)=>{
+/**
+ * Example test with no META variant
+ * https://github.com/nodejs/node/blob/03854f6/test/fixtures/wpt/WebCryptoAPI/sign_verify/hmac.https.any.js#L1-L4
+ *
+ * Example test with multiple META variants
+ * https://github.com/nodejs/node/blob/03854f6/test/fixtures/wpt/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js#L1-L9
+ */
+for(constvariantofmeta.variant||['']){
+constworkerPath=path.join(__dirname,'wpt/worker.js');
 constworker=newWorker(workerPath,{
 execArgv: this.flags,
 workerData: {
@@ -647,17 +635,6 @@ class WPTRunner {
 });
 
 awaitevents.once(worker,'exit').catch(()=>{});
-};
-
-/**
- * Example test with no META variant
- * https://github.com/nodejs/node/blob/03854f6/test/fixtures/wpt/WebCryptoAPI/sign_verify/hmac.https.any.js#L1-L4
- *
- * Example test with multiple META variants
- * https://github.com/nodejs/node/blob/03854f6/test/fixtures/wpt/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js#L1-L9
- */
-for(constvariantofmeta.variant||['']){
-run(()=>runWorker(variant));
 }
 }
 

test/wpt/testcfg.py

@@ -3,4 +3,4 @@
 importtestpy
 
 defGetConfiguration(context, root):
-returntestpy.ParallelTestConfiguration(context, root, 'wpt')
+returntestpy.SimpleTestConfiguration(context, root, 'wpt')