Skip to content

Merge customTestList and testList #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
camillobruni merged 2 commits into from
Jul 29, 2025
Merged

Merge customTestList and testList #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d123105
merge
camillobruni Jul 29, 2025
feec4db
address comment
camillobruni Jul 29, 2025
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
24 changes: 11 additions & 13 deletions JetStreamDriver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ globalThis.testIterationCountMap ??= new Map();
globalThis.testWorstCaseCount ??= undefined;
globalThis.testWorstCaseCountMap ??= new Map();
globalThis.dumpJSONResults ??= false;
globalThis.customTestList ??= [];
globalThis.testList ??= undefined;
globalThis.startDelay ??= undefined;

let shouldReport = false;
Expand All @@ -53,8 +53,8 @@ function getIntParam(urlParams, key) {
}

function getTestListParam(urlParams, key) {
if (globalThis.customTestList.length)
throw new Error(`Overriding previous customTestList=${globalThis.customTestList.join()} with ${key} url-parameter.`);
if (globalThis.testList?.length)
throw new Error(`Overriding previous testList=${globalThis.testList.join()} with ${key} url-parameter.`);
return urlParams.getAll(key);
}

Expand All @@ -65,9 +65,9 @@ if (typeof(URLSearchParams) !== "undefined") {
if (shouldReport && !globalThis.startDelay)
globalThis.startDelay = 4000;
if (urlParameters.has("tag"))
customTestList = getTestListParam(urlParameters, "tag");
globalThis.testList = getTestListParam(urlParameters, "tag");
if (urlParameters.has("test"))
customTestList = getTestListParam(urlParameters, "test");
globalThis.testList = getTestListParam(urlParameters, "test");
globalThis.testIterationCount = getIntParam(urlParameters, "iterationCount");
globalThis.testWorstCaseCount = getIntParam(urlParameters, "worstCaseCount");
}
Expand All @@ -93,8 +93,8 @@ function displayCategoryScores() {
function getIterationCount(plan) {
if (testIterationCountMap.has(plan.name))
return testIterationCountMap.get(plan.name);
if (testIterationCount)
return testIterationCount;
if (globalThis.testIterationCount)
return globalThis.testIterationCount;
if (plan.iterations)
return plan.iterations;
return defaultIterationCount;
Expand All @@ -103,8 +103,8 @@ function getIterationCount(plan) {
function getWorstCaseCount(plan) {
if (testWorstCaseCountMap.has(plan.name))
return testWorstCaseCountMap.get(plan.name);
if (testWorstCaseCount)
return testWorstCaseCount;
if (globalThis.testWorstCaseCount)
return globalThis.testWorstCaseCount;
if (plan.worstCaseCount)
return plan.worstCaseCount;
return defaultWorstCaseCount;
Expand Down Expand Up @@ -2370,10 +2370,8 @@ const defaultDisabledTags = [];
if (!isInBrowser)
defaultDisabledTags.push("WorkerTests");

if (typeof testList !== "undefined") {
processTestList(testList);
} else if (customTestList.length) {
processTestList(customTestList);
if (globalThis.testList?.length) {
processTestList(globalThis.testList);
} else {
globalThis.JetStream.enableBenchmarksByTag("Default", defaultDisabledTags)
}
14 changes: 3 additions & 11 deletions shell-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,8 @@ if (isSpiderMonkey) {
globalThis.readFile = readRelativeToScript;
globalThis.arguments = scriptArgs;
}

if (typeof arguments !== "undefined" && arguments.length > 0)
testList = arguments.slice();
if (typeof testList === "undefined")
testList = undefined;

if (typeof testIterationCount === "undefined")
testIterationCount = undefined;
if (globalThis.arguments?.length)
globalThis.testList = globalThis.arguments.slice();

if (typeof runMode !== "undefined" && runMode == "RAMification")
RAMification = true;
else
RAMification = false;
globalThis.RAMification = true;
Loading