diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2021-11-30 11:13:19 +0100 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2021-11-30 11:13:19 +0100 |
| commit | 1feeda80a058faa724770582d4a11c05ccb88e08 (patch) | |
| tree | 9cd636c5e7de6581f0984fde309cc9b06d80eb56 /src/tools/rustdoc-gui/tester.js | |
| parent | 9981e56d3b820f429fac62b4ff916f2a871340b4 (diff) | |
| download | rust-1feeda80a058faa724770582d4a11c05ccb88e08.tar.gz rust-1feeda80a058faa724770582d4a11c05ccb88e08.zip | |
Simplify --no-headless option for rustdoc-gui tester
Diffstat (limited to 'src/tools/rustdoc-gui/tester.js')
| -rw-r--r-- | src/tools/rustdoc-gui/tester.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/tools/rustdoc-gui/tester.js b/src/tools/rustdoc-gui/tester.js index 0d6a2605d4f..3feb4940d87 100644 --- a/src/tools/rustdoc-gui/tester.js +++ b/src/tools/rustdoc-gui/tester.js @@ -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); } } |
