Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions resources/benchmark-runner.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,8 @@ export class BenchmarkRunner {
const suites = await this._prepareAllSuites();
try {
for (const suite of suites) {
if (suite.disabled)
if (!suite.enabled)
continue;

try {
await this._appendFrame();
this._page = new Page(this._frame);
Expand Down
14 changes: 7 additions & 7 deletions resources/developer-mode.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function createUIForSuites() {
control.className = "suites";
const checkboxes = [];
const setSuiteEnabled = (suiteIndex, enabled) => {
Suites[suiteIndex].disabled = !enabled;
Suites[suiteIndex].enabled = enabled;
checkboxes[suiteIndex].checked = enabled;
};

Expand All @@ -157,9 +157,9 @@ function createUIForSuites() {
const checkbox = document.createElement("input");
checkbox.id = suite.name;
checkbox.type = "checkbox";
checkbox.checked = !suite.disabled;
checkbox.checked = suite.enabled;
checkbox.onchange = () => {
suite.disabled = !checkbox.checked;
suite.enabled = checkbox.checked;
updateURL();
};
checkboxes.push(checkbox);
Expand Down Expand Up @@ -275,17 +275,17 @@ function updateParamsSuitesAndTags() {

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

// Try finding common tags that would result in the current suite selection.
let commonTags = new Set(selectedSuites[0].tags);
for (const suite of Suites) {
if (suite.disabled)
suite.tags.forEach((tag) => commonTags.delete(tag));
else
if (suite.enabled)
commonTags = new Set(suite.tags.filter((tag) => commonTags.has(tag)));
else
suite.tags.forEach((tag) => commonTags.delete(tag));
}
if (selectedSuites.length > 1 && commonTags.size)
params.tags = [...commonTags];
Expand Down
7 changes: 3 additions & 4 deletions resources/main.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ class MainBenchmarkClient {
if (this._isRunning)
return false;

if (Suites.every((suite) => suite.disabled)) {
const enabledSuites = Suites.filter((suite) => suite.enabled);
const totalSuitesCount = enabledSuites.length;
if (totalSuitesCount === 0) {
const message = `No suites selected - "${params.suites}" does not exist.`;
alert(message);
console.error(
Expand All @@ -75,7 +77,6 @@ class MainBenchmarkClient {
"\nValid values:",
Suites.map((each) => each.name)
);

return false;
}
if (!this._isStepping())
Expand All @@ -93,8 +94,6 @@ class MainBenchmarkClient {
this._metrics = Object.create(null);
this._isRunning = true;

const enabledSuites = Suites.filter((suite) => !suite.disabled);
const totalSuitesCount = enabledSuites.length;
this.stepCount = params.iterationCount * totalSuitesCount;
this._progressCompleted.max = this.stepCount;
this.suitesCount = enabledSuites.length;
Expand Down
Loading
Loading