Make the progress bar track indivisual suites, not indivisual steps.

This is needed to allow for remote workloads.
WebKit · Dec 17, 2024 · 49e10ed · 49e10ed
1 parent e2e3c49
commit 49e10ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/resources/main.mjs b/resources/main.mjs
@@ -93,10 +93,8 @@ class MainBenchmarkClient {
         this._isRunning = true;
 
         const enabledSuites = Suites.filter((suite) => !suite.disabled);
-        const totalSubtestsCount = enabledSuites.reduce((testsCount, suite) => {
-            return testsCount + suite.tests.length;
-        }, 0);
-        this.stepCount = params.iterationCount * totalSubtestsCount;
+        const totalSuitesCount = enabledSuites.length;
+        this.stepCount = params.iterationCount * totalSuitesCount;
         this._progressCompleted.max = this.stepCount;
         this.suitesCount = enabledSuites.length;
         const runner = new BenchmarkRunner(Suites, this);
@@ -121,7 +119,7 @@ class MainBenchmarkClient {
             await this._awaitNextStep(suite, test);
     }
 
-    didRunTest() {
+    didFinishSuite() {
         this._finishedTestCount++;
         this._progressCompleted.value = this._finishedTestCount;
     }

diff --git a/resources/suite-runner.mjs b/resources/suite-runner.mjs
@@ -60,6 +60,8 @@ export class SuiteRunner {
 
         performance.measure(`suite-${suiteName}`, suiteStartLabel, suiteEndLabel);
         this._validateSuiteTotal();
+        if (this.#client?.didFinishSuite)
+            await this.#client.didFinishSuite(this.#suite);
     }
 
     _validateSuiteTotal() {