mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #91391 - GuillaumeGomez:simplify-no-headless, r=jsha

Browse Source 
Simplify --no-headless option for rustdoc-gui tester

It adds a message stating the change for the concurrency and also remove the extra condition when running the tests.

r? `@camelid`
This commit is contained in:
Matthias Krüger 2021-12-06 00:11:48 +01:00 committed by GitHub
commit 9c777fc6b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/rustdoc-gui/tester.js
View File

@ -172,11 +172,16 @@ async function main(argv) {
}
files.sort();
if (no_headless) {
opts["jobs"] = 1;
console.log("`--no-headless` option is active, disabling concurrency for running tests.");
}
console.log(`Running ${files.length} rustdoc-gui (${opts["jobs"]} concurrently) ...`);
if (opts["jobs"] < 1) {
process.setMaxListeners(files.length + 1);
} else {
} else if (!no_headless) {
process.setMaxListeners(opts["jobs"] + 1);
}
@ -217,9 +222,7 @@ async function main(argv) {
tests_queue.splice(tests_queue.indexOf(callback), 1);
});
tests_queue.push(callback);
if (no_headless) {
await tests_queue[i];
} else if (opts["jobs"] > 0 && tests_queue.length >= opts["jobs"]) {
if (opts["jobs"] > 0 && tests_queue.length >= opts["jobs"]) {
await Promise.race(tests_queue);
}
}