Skip to content

Commit deba93c

Browse files
authored
Add default tag (#520)
- Add "default" tag for all default-scored workloads (as an explicit distinction from "experimental") - Replace .disabled with .enabled to simplify a bit more code Drive-by-fix: - Rename _validateSuiteRessultsStub to _validateSuiteResultsStub
1 parent c126fed commit deba93c

File tree

6 files changed

+44
-62
lines changed

6 files changed

+44
-62
lines changed

resources/benchmark-runner.mjs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,8 @@ export class BenchmarkRunner {
409409
const suites = await this._prepareAllSuites();
410410
try {
411411
for (const suite of suites) {
412-
if (suite.disabled)
412+
if (!suite.enabled)
413413
continue;
414-
415414
try {
416415
await this._appendFrame();
417416
this._page = new Page(this._frame);

resources/developer-mode.mjs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ function createUIForSuites() {
145145
control.className = "suites";
146146
const checkboxes = [];
147147
const setSuiteEnabled = (suiteIndex, enabled) => {
148-
Suites[suiteIndex].disabled = !enabled;
148+
Suites[suiteIndex].enabled = enabled;
149149
checkboxes[suiteIndex].checked = enabled;
150150
};
151151

@@ -157,9 +157,9 @@ function createUIForSuites() {
157157
const checkbox = document.createElement("input");
158158
checkbox.id = suite.name;
159159
checkbox.type = "checkbox";
160-
checkbox.checked = !suite.disabled;
160+
checkbox.checked = suite.enabled;
161161
checkbox.onchange = () => {
162-
suite.disabled = !checkbox.checked;
162+
suite.enabled = checkbox.checked;
163163
updateURL();
164164
};
165165
checkboxes.push(checkbox);
@@ -275,17 +275,17 @@ function updateParamsSuitesAndTags() {
275275

276276
// If less than all suites are selected then change the URL "Suites" GET parameter
277277
// to comma separate only the selected
278-
const selectedSuites = Suites.filter((suite) => !suite.disabled);
278+
const selectedSuites = Suites.filter((suite) => suite.enabled);
279279
if (!selectedSuites.length)
280280
return;
281281

282282
// Try finding common tags that would result in the current suite selection.
283283
let commonTags = new Set(selectedSuites[0].tags);
284284
for (const suite of Suites) {
285-
if (suite.disabled)
286-
suite.tags.forEach((tag) => commonTags.delete(tag));
287-
else
285+
if (suite.enabled)
288286
commonTags = new Set(suite.tags.filter((tag) => commonTags.has(tag)));
287+
else
288+
suite.tags.forEach((tag) => commonTags.delete(tag));
289289
}
290290
if (selectedSuites.length > 1 && commonTags.size)
291291
params.tags = [...commonTags];

resources/main.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ class MainBenchmarkClient {
6666
if (this._isRunning)
6767
return false;
6868

69-
if (Suites.every((suite) => suite.disabled)) {
69+
const enabledSuites = Suites.filter((suite) => suite.enabled);
70+
const totalSuitesCount = enabledSuites.length;
71+
if (totalSuitesCount === 0) {
7072
const message = `No suites selected - "${params.suites}" does not exist.`;
7173
alert(message);
7274
console.error(
@@ -75,7 +77,6 @@ class MainBenchmarkClient {
7577
"\nValid values:",
7678
Suites.map((each) => each.name)
7779
);
78-
7980
return false;
8081
}
8182
if (!this._isStepping())
@@ -93,8 +94,6 @@ class MainBenchmarkClient {
9394
this._metrics = Object.create(null);
9495
this._isRunning = true;
9596

96-
const enabledSuites = Suites.filter((suite) => !suite.disabled);
97-
const totalSuitesCount = enabledSuites.length;
9897
this.stepCount = params.iterationCount * totalSuitesCount;
9998
this._progressCompleted.max = this.stepCount;
10099
this.suitesCount = enabledSuites.length;

0 commit comments

Comments
 (0)