Auto merge of #91573 - matthiaskrgr:rollup-wcygm2r, r=matthiaskrgr

Rollup of 5 pull requests

Successful merges:

 - #91367 (Fix ICE in `check_must_not_suspend_ty()`)
 - #91391 (Simplify --no-headless option for rustdoc-gui tester)
 - #91537 (compiler/rustc_target: make m68k-unknown-linux-gnu use the gnu base)
 - #91554 (Update doc about code block edition attributes)
 - #91563 (Bump download-ci-llvm-stamp for LLD inclusion)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup

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);
         }
     }