ktstr 0.23.0

Test harness for Linux process schedulers
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
//! `make` subprocess invocation.
//!
//! Three `make` invocation paths:
//! - [`run_make`] inherits the parent's stdout/stderr under a
//!   wall-clock timeout — used for `mrproper` and other calls made
//!   outside an active progress group, where raw pass-through is fine.
//! - [`run_make_captured`] captures merged stdout+stderr under a
//!   wall-clock timeout and replays it only on failure/timeout — used
//!   for the `defconfig` / `olddefconfig` configure step, which runs
//!   under a live "Configuring kernel..." spinner that raw
//!   pass-through would clobber (and whose output — e.g. `override:
//!   reassigning to symbol …` warnings from the fragment — is routine
//!   noise on the success path).
//! - [`run_make_with_output`] streams merged stdout+stderr through the
//!   progress group live with no timeout — used for the full build,
//!   whose minutes-long (legitimately unbounded) output the operator
//!   watches.
//!
//! The two timed paths share [`poll_deadline`] (wrapped by
//! [`poll_child_with_timeout`] for the inherit path); the two
//! capturing paths share [`drain_lines_lossy`]. Extracting both lets
//! the timeout and line-drain mechanics be exercised against synthetic
//! [`std::process::Child`] fixtures and in-memory readers without
//! spawning real `make` or emitting non-UTF-8 compiler output.

use std::io::BufRead;
use std::path::Path;
use std::time::Duration;

use anyhow::{Context, Result, bail};

/// Wall-clock ceiling for the timed `make` paths ([`run_make`],
/// [`run_make_captured`]).
///
/// The timeout protects against a wedged make holding the calling
/// pipeline forever. Without it, a stuck `olddefconfig` (e.g. an
/// interactive `conf` prompt that the `configure_kernel` pre-step
/// failed to bypass, or a kernel-tree inconsistency that wedges
/// `make`) would block the parent process indefinitely. The ceiling
/// is intentionally generous — a single `make defconfig` completes in
/// seconds on any hardware, but large WIP kernel trees with many
/// out-of-tree patches can stretch `mrproper` / `olddefconfig` past
/// the typical seconds-scale; 30 minutes covers every legitimate
/// caller while still bounding a genuine wedge.
pub(super) const MAKE_TIMEOUT: Duration = Duration::from_secs(30 * 60);

/// Production `try_wait` poll cadence for the timed `make` paths —
/// small enough that a completed make is reaped within one tick, large
/// enough that the polling itself is not measurable load. Tests pass a
/// sub-millisecond override directly to [`poll_child_with_timeout`] /
/// [`run_make_captured`] so timeout-fires-and-reaps assertions
/// complete quickly.
pub(super) const MAKE_POLL_INTERVAL: Duration = Duration::from_millis(100);

/// Run make in a kernel directory under a wall-clock timeout, with the
/// parent's stdout/stderr inherited.
///
/// Used for `mrproper` and other `make` calls made outside an active
/// progress group, where raw pass-through is fine. The two capturing
/// siblings — `run_make_captured` (configure step, replay-on-failure)
/// and [`run_make_with_output`] (full build, live stream) — pipe-drain
/// the output instead so it does not clobber a live spinner or bar.
///
/// On timeout the child is killed (SIGKILL) and reaped before bailing
/// so no zombie outlives the function; see `poll_child_with_timeout`
/// for the shared poll+reap mechanics.
pub fn run_make(kernel_dir: &Path, args: &[&str]) -> Result<()> {
    let child = std::process::Command::new("make")
        .args(args)
        .current_dir(kernel_dir)
        .spawn()
        .with_context(|| format!("spawn make {}", args.join(" ")))?;

    poll_child_with_timeout(
        child,
        MAKE_TIMEOUT,
        MAKE_POLL_INTERVAL,
        &format!("make {}", args.join(" ")),
    )
}

/// Outcome of [`poll_deadline`] — reported without collapsing to a
/// single error so callers can attach their own bail wording and, on
/// the capturing path, replay captured output and sweep the process
/// group before failing.
enum PollOutcome {
    /// Child exited on its own; `try_wait` already reaped it. The
    /// carried status may be success or failure.
    Exited(std::process::ExitStatus),
    /// Deadline elapsed before the child exited; it was killed and
    /// reaped inside [`poll_deadline`].
    TimedOut,
    /// `try_wait` itself errored; the child was killed and reaped
    /// inside [`poll_deadline`] before returning.
    WaitErr(std::io::Error),
}

/// Poll `child` until it exits or `timeout` elapses, then return the
/// outcome without bailing.
///
/// `timeout` is the wall-clock budget AFTER `child` has already
/// spawned (the deadline is computed relative to the call instant).
/// `poll_interval` controls the `try_wait` cadence — small enough that
/// a completed child is reaped within one tick, large enough that
/// polling itself is not measurable load. Production passes
/// [`MAKE_POLL_INTERVAL`] (100ms); tests pass 1ms so a sub-second
/// timeout assertion completes quickly.
///
/// On a clean exit the returned status is already reaped (`try_wait`
/// consumed it). On timeout or a `try_wait` error the child is killed
/// AND reaped before returning, so no zombie outlives the call in any
/// path. Extracted from [`run_make`] so the timeout mechanics can be
/// exercised against synthetic [`std::process::Child`] fixtures with
/// sub-second deadlines (real `make` invocations would burn the full
/// production timeout) — see [`poll_child_with_timeout`]'s tests.
fn poll_deadline(
    child: &mut std::process::Child,
    timeout: Duration,
    poll_interval: Duration,
) -> PollOutcome {
    let deadline = std::time::Instant::now() + timeout;
    loop {
        match child.try_wait() {
            Ok(Some(status)) => return PollOutcome::Exited(status),
            Ok(None) => {
                if std::time::Instant::now() >= deadline {
                    // Wedged — kill + reap so no zombie persists.
                    let _ = child.kill();
                    let _ = child.wait();
                    return PollOutcome::TimedOut;
                }
                std::thread::sleep(poll_interval);
            }
            Err(e) => {
                // Reap before returning so a transient try_wait
                // failure doesn't leak the child.
                let _ = child.kill();
                let _ = child.wait();
                return PollOutcome::WaitErr(e);
            }
        }
    }
}

/// Poll an already-spawned `child` under a wall-clock timeout, mapping
/// the [`poll_deadline`] outcome to a labeled `Result` for the
/// stdout/stderr-inherited [`run_make`] path.
///
/// `label` is the human-facing name embedded in error messages (e.g.
/// `"make defconfig"`) — pinning a synthetic label in the test surface
/// lets the assertion match the bail wording without depending on
/// `make` being installed on the runner.
///
/// On timeout the bail carries `timed out after`; on a non-zero exit
/// it carries `failed`; on a `try_wait` error it wraps the io error
/// with `wait on {label}`. The child is always reaped before this
/// returns (see [`poll_deadline`]).
pub(super) fn poll_child_with_timeout(
    mut child: std::process::Child,
    timeout: Duration,
    poll_interval: Duration,
    label: &str,
) -> Result<()> {
    match poll_deadline(&mut child, timeout, poll_interval) {
        PollOutcome::Exited(status) => {
            anyhow::ensure!(status.success(), "{label} failed");
            Ok(())
        }
        PollOutcome::TimedOut => {
            bail!("{label} timed out after {timeout:?}; child killed")
        }
        PollOutcome::WaitErr(e) => Err(e).with_context(|| format!("wait on {label}")),
    }
}

/// Drain a reader into a `Vec<String>`, one entry per newline-delimited
/// chunk, with a final partial chunk (no trailing newline) emitted
/// with the same lossy-UTF-8 conversion. Byte-oriented so non-UTF-8
/// input survives via `from_utf8_lossy` (U+FFFD replacement) instead
/// of being dropped at the line boundary. Strips the trailing `\n`
/// and an optional preceding `\r` so CRLF input matches LF semantics.
/// Calls `on_line` for each line before appending to the returned
/// `Vec`.
///
/// Returned entries and the `on_line` argument never carry their
/// terminating `\n` (or `\r\n`) — the strip runs before emission, so
/// callers that re-emit with `println!` get clean single-newline
/// formatting and callers that persist the strings do not double-
/// count line terminators. Interior `\r` bytes (lone CR not paired
/// with a trailing LF) pass through verbatim, matching the unit
/// coverage in `drain_lines_lossy_lone_cr_at_eof_is_preserved` and
/// `drain_lines_lossy_interior_cr_is_preserved`.
///
/// Extracted from [`run_make_with_output`] so the read logic is
/// testable with in-memory readers (the caller still owns child
/// kill+wait).
pub(super) fn drain_lines_lossy(
    mut reader: impl BufRead,
    mut on_line: impl FnMut(&str),
) -> std::io::Result<Vec<String>> {
    let mut captured = Vec::new();
    let mut buf = Vec::new();
    loop {
        buf.clear();
        let n = reader.read_until(b'\n', &mut buf)?;
        if n == 0 {
            break;
        }
        let mut slice: &[u8] = &buf;
        if let Some(rest) = slice.strip_suffix(b"\n") {
            slice = rest;
            if let Some(rest) = slice.strip_suffix(b"\r") {
                slice = rest;
            }
        }
        let line = String::from_utf8_lossy(slice).into_owned();
        on_line(&line);
        captured.push(line);
    }
    Ok(captured)
}

/// Run make with merged stdout+stderr piped through the progress group.
///
/// Creates a single pipe via `nix::unistd::pipe2(O_CLOEXEC)`, hands
/// the write end to the child's stdout AND stderr (a clone), and
/// reads from the read end. `O_CLOEXEC` prevents the raw pipe fds
/// from leaking into any concurrently-spawned children on other
/// threads — without the flag, a race between `pipe()` and the
/// `Stdio::from()` consumption could let an unrelated `fork+exec`
/// inherit the write end and hold the reader open indefinitely.
/// One pipe, one reader — no threads, no channel, no chance of a
/// deadlock where reading stdout blocks while stderr fills its
/// buffer. Same merged-stream semantics that `sh -c "make … 2>&1"`
/// gives, without the shell-out.
///
/// When a progress group is supplied, each line is printed via
/// `crate::cli::FetchProgress::println` (which lands above the live
/// bars, or on stderr when the group is hidden). When `None`, output
/// is captured and shown only on failure.
///
/// Pipe-read I/O errors propagate via `Err` rather than silently
/// ending the read loop. The prior line-iterator formulation
/// (`.lines()` + `Result::ok`) dropped every error-tagged item —
/// a mid-stream read failure just looked like EOF and the child's
/// tail output disappeared without a diagnostic. The byte-oriented
/// `drain_lines_lossy` now surfaces such failures with `anyhow`
/// context naming the merged-stream read, so a broken-pipe or EIO
/// during make's output is caught at the call site.
///
/// Lines observed by the progress group's `println` and retained in the
/// on-failure replay buffer are LF-normalized: `drain_lines_lossy`
/// strips the trailing `\n`, and a preceding `\r` (the CRLF form
/// Make emits on some toolchain + terminal combinations) is
/// stripped too, so every line the caller sees is LF-only and
/// terminator-less. Interior lone `\r` bytes — e.g. a progress
/// bar using carriage-return redraw — pass through verbatim (see
/// `drain_lines_lossy_interior_cr_is_preserved`), which keeps
/// the on-failure replay readable without mangling tools that
/// legitimately use `\r` mid-line.
pub fn run_make_with_output(
    kernel_dir: &Path,
    args: &[&str],
    progress: Option<&crate::cli::FetchProgress>,
) -> Result<()> {
    let (read_fd, write_fd) = nix::unistd::pipe2(nix::fcntl::OFlag::O_CLOEXEC)
        .context("create pipe for merged make stdout+stderr")?;
    let write_fd_err = write_fd
        .try_clone()
        .context("clone pipe write end for stderr")?;

    // NOTE: do NOT arm PR_SET_PDEATHSIG via CommandExt::pre_exec to reap
    // make on parent death — pre_exec forces the fork+exec path, and this
    // orchestrator is multithreaded (jemalloc background threads, at least),
    // so the forked child can deadlock BEFORE exec on a lock another thread
    // held at fork time (empirically the high-volume drain tests below hang
    // with no make ever exec'd). Parent death is already handled without it:
    // the parent holds the only pipe READ end (below), so when it dies make
    // and its gcc workers get SIGPIPE on their next write (std resets SIGPIPE
    // to SIG_DFL in spawned children) and terminate; the normal / pipe-error
    // paths reap via the explicit wait / kill below.
    let mut child = std::process::Command::new("make")
        .args(args)
        .current_dir(kernel_dir)
        .stdout(std::process::Stdio::from(write_fd))
        .stderr(std::process::Stdio::from(write_fd_err))
        .spawn()
        .with_context(|| format!("spawn make {}", args.join(" ")))?;

    // Parent has no remaining writer handles. `Stdio::from(OwnedFd)`
    // consumed `write_fd` and `write_fd_err` into the Command
    // builder; during `.spawn()` the builder installs them as the
    // child's stdout/stderr via `dup2`, then drops its own OwnedFd
    // copies. The child therefore holds the only live write ends
    // (its dup2'd stdout/stderr, fd 1/2). When `make` exits, those
    // fds are closed and the reader here sees EOF naturally.
    //
    // Read as bytes and convert each line via `from_utf8_lossy` at
    // the boundary. Compiler output can include non-UTF-8 bytes —
    // source paths on exotic filesystems, embedded binary fragments
    // from diagnostic tools, locale-encoded text — and a pure-String
    // reader would drop those lines via the `Result::ok` filter,
    // hiding real compiler errors in CI logs. Lossy conversion keeps
    // every line visible with U+FFFD where the bytes were not valid
    // UTF-8.
    let reader = std::io::BufReader::new(std::fs::File::from(read_fd));
    let captured = match drain_lines_lossy(reader, |line| {
        if let Some(p) = progress {
            p.println(line);
        }
    }) {
        Ok(v) => v,
        Err(e) => {
            // On pipe-read I/O failure, kill and reap the child
            // before propagating so `make` doesn't linger as a
            // zombie — stdlib's Child does not auto-wait on drop.
            // Both ops use `.ok()` because the read-side error is
            // the actionable diagnostic; a secondary wait/kill
            // failure should not mask it.
            child.kill().ok();
            child.wait().ok();
            return Err(e).context("read merged make stdout+stderr");
        }
    };

    let status = child.wait()?;
    if !status.success() {
        // Always show captured output on failure so CI logs contain
        // the actual compiler errors, not just "make failed".
        for line in &captured {
            eprintln!("{line}");
        }
        bail!("make {} failed", args.join(" "));
    }
    Ok(())
}

/// Run make capturing merged stdout+stderr, under a wall-clock
/// timeout, replaying the captured output ONLY on failure or timeout.
///
/// Used for the `defconfig` / `olddefconfig` configure step, which
/// runs under a live "Configuring kernel..." spinner. Unlike
/// [`run_make_with_output`] (which streams every line live for the
/// minutes-long build), this path stays SILENT on success: the
/// configure step is fast and its output is routine noise (defconfig
/// echoes, `override: reassigning to symbol …` warnings from ktstr's
/// baked-in fragment intentionally overriding defconfig values), so
/// streaming it would clutter the spinner without informing the
/// operator. On failure or timeout the full captured output is
/// replayed via [`replay_captured`] — above the progress bars through
/// [`crate::cli::FetchProgress::println`] when a group is supplied,
/// else on stderr — so a genuine configure error stays fully
/// diagnosable.
///
/// Drains the merged pipe on a scoped worker thread while the calling
/// thread runs [`poll_deadline`]: a single blocking read loop cannot
/// also poll the child, so the read runs on its own thread. Continuous
/// draining means the child never blocks on a full pipe regardless of
/// output volume — the same single-pipe/single-reader no-deadlock
/// property [`run_make_with_output`] documents. stdin is inherited,
/// matching [`run_make`]: `olddefconfig` resolves new symbols
/// non-interactively after the fragment append, and the timeout
/// backstops any prompt that slips through.
pub(super) fn run_make_captured(
    kernel_dir: &Path,
    args: &[&str],
    progress: Option<&crate::cli::FetchProgress>,
    timeout: Duration,
    poll_interval: Duration,
) -> Result<()> {
    use std::os::unix::process::CommandExt as _;

    let (read_fd, write_fd) = nix::unistd::pipe2(nix::fcntl::OFlag::O_CLOEXEC)
        .context("create pipe for merged make stdout+stderr")?;
    let write_fd_err = write_fd
        .try_clone()
        .context("clone pipe write end for stderr")?;

    // `process_group(0)` makes the child a process-group leader (pgid
    // == its pid). The configure step's `make` spawns a short-lived
    // `scripts/kconfig/conf`; if that wedges (e.g. an interactive
    // prompt blocked on stdin) it inherits — and holds open — the
    // pipe's write end. Killing `make` alone would leave `conf` alive,
    // the write end open, and the drain thread blocked on read
    // forever. The group kill (below) sweeps `make` AND its
    // descendants so every write end closes and the reader hits EOF.
    //
    // Trade-off of the fresh group: `make` is no longer in the
    // terminal's foreground group, so a Ctrl-C (SIGINT) during the
    // seconds-scale configure step reaches only the parent CLI, not
    // `make` directly — the parent exiting then breaks the pipe and
    // `make` dies of EPIPE. The streaming build path
    // (`run_make_with_output`) keeps the parent's group and stays
    // directly Ctrl-C-interruptible.
    let mut child = std::process::Command::new("make")
        .args(args)
        .current_dir(kernel_dir)
        .stdout(std::process::Stdio::from(write_fd))
        .stderr(std::process::Stdio::from(write_fd_err))
        .process_group(0)
        .spawn()
        .with_context(|| format!("spawn make {}", args.join(" ")))?;
    // The child leads its own group, so its pid IS the pgid. Guard the
    // cast the way `scenario::payload_run::kill_payload_process_group`
    // does: `killpg` with a non-positive pgid broadcasts to the
    // caller's group / every permitted process, so a pid that is
    // non-positive or outside `pid_t` must never reach `killpg`. Linux
    // pid_max <= 2^22 makes this unreachable in practice; the guard
    // keeps the destructive syscall safe regardless.
    let child_pgid: Option<nix::unistd::Pid> = libc::pid_t::try_from(child.id())
        .ok()
        .filter(|&p| p > 0)
        .map(nix::unistd::Pid::from_raw);
    debug_assert!(
        child_pgid.is_some(),
        "make child pid {} is not a valid pgid",
        child.id()
    );

    // Parent holds no write ends after spawn (Stdio::from consumed
    // both OwnedFds and the builder dropped its dup2'd copies), so the
    // reader sees EOF once every write-end holder closes — on the
    // child's natural exit, or on the timeout group-kill below. Drain
    // on a scoped thread so the calling thread can enforce the
    // deadline concurrently.
    let reader = std::io::BufReader::new(std::fs::File::from(read_fd));
    let (outcome, drained) = std::thread::scope(|scope| {
        let drain = scope.spawn(move || drain_lines_lossy(reader, |_line| {}));
        let outcome = poll_deadline(&mut child, timeout, poll_interval);
        // Sweep the process group on EVERY path before joining the
        // drain thread. poll_deadline already reaped `make` itself (via
        // try_wait on a clean exit, or kill+wait on timeout), but any
        // descendant that inherited the pipe's write end — a wedged
        // `conf` on the timeout path, or a backgrounded recipe process
        // on a clean exit — would keep the reader from ever seeing EOF
        // and hang drain.join() with no remaining backstop. killpg
        // closes those write ends. An already-empty (all-reaped) group
        // ESRCHs harmlessly. Unconditional-sweep-after-wait matches
        // `scenario::payload_run::PayloadHandle::wait`.
        if let Some(pgid) = child_pgid {
            let _ = nix::sys::signal::killpg(pgid, nix::sys::signal::Signal::SIGKILL);
        }
        let drained = drain.join().expect("make output drain thread panicked");
        (outcome, drained)
    });

    // A drain-thread read error wins over the make outcome here (the
    // `?` propagates it before the outcome match), matching
    // `run_make_with_output`: the pipe-read failure is itself the
    // actionable diagnostic.
    let captured = drained.context("read merged make stdout+stderr")?;
    let label = format!("make {}", args.join(" "));
    // Every failure arm replays the captured output before surfacing so
    // the contract in this function's doc ("replayed on failure or
    // timeout") holds symmetrically — including the rare WaitErr path.
    match outcome {
        PollOutcome::Exited(status) if status.success() => Ok(()),
        PollOutcome::Exited(_) => {
            replay_captured(&captured, progress);
            bail!("{label} failed");
        }
        PollOutcome::TimedOut => {
            replay_captured(&captured, progress);
            bail!("{label} timed out after {timeout:?}; child killed");
        }
        PollOutcome::WaitErr(e) => {
            replay_captured(&captured, progress);
            Err(e).with_context(|| format!("wait on {label}"))
        }
    }
}

/// Replay captured make output on the failure path — above the
/// progress bars via [`crate::cli::FetchProgress::println`] when a
/// group is live (so it does not interleave with the bars), else on
/// stderr. Lines are already LF-normalized and terminator-less
/// ([`drain_lines_lossy`]).
fn replay_captured(captured: &[String], progress: Option<&crate::cli::FetchProgress>) {
    for line in captured {
        match progress {
            Some(p) => p.println(line),
            None => eprintln!("{line}"),
        }
    }
}

/// Build the kernel with output piped through the progress group.
///
/// `jobs_override` supplies the `-jN` count when set (used by
/// `kernel_build_pipeline` under `--cpu-cap` to keep gcc's
/// parallelism aligned with the reserved CPU count). `None`
/// falls back to `std::thread::available_parallelism`.
pub fn make_kernel_with_output(
    kernel_dir: &Path,
    progress: Option<&crate::cli::FetchProgress>,
    jobs_override: Option<usize>,
) -> Result<()> {
    let nproc = jobs_override.unwrap_or_else(|| {
        std::thread::available_parallelism()
            .map(|n| n.get())
            .unwrap_or(1)
    });
    let args = build_make_args(nproc);
    let arg_refs: Vec<&str> = args.iter().map(|s| s.as_str()).collect();
    run_make_with_output(kernel_dir, &arg_refs, progress)
}

/// Build the make arguments for a kernel build.
///
/// Returns the argument list that would be passed to `make` for a
/// parallel kernel build: `["-jN", "KCFLAGS=-Wno-error"]`.
pub(super) fn build_make_args(nproc: usize) -> Vec<String> {
    vec![format!("-j{nproc}"), "KCFLAGS=-Wno-error".into()]
}

#[cfg(test)]
mod tests {
    use super::*;
    use std::time::Duration;

    /// Whether `name` resolves to a binary on `PATH`. Inlined here
    /// (rather than reaching across to `super::super::resolve::resolve_in_path`)
    /// so the test module is self-contained and cannot regress on
    /// a path change in the resolver helper.
    fn make_in_path() -> bool {
        let Ok(path) = std::env::var("PATH") else {
            return false;
        };
        std::env::split_paths(&path).any(|p| p.join("make").is_file())
    }

    // -- drain_lines_lossy --

    #[test]
    fn drain_lines_lossy_eof_terminated_happy_path() {
        let input: &[u8] = b"alpha\nbeta\ngamma\n";
        let mut seen = Vec::new();
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |line| {
            seen.push(line.to_string())
        })
        .unwrap();
        assert_eq!(captured, vec!["alpha", "beta", "gamma"]);
        assert_eq!(seen, captured);
    }

    #[test]
    fn drain_lines_lossy_strips_crlf() {
        let input: &[u8] = b"one\r\ntwo\r\nthree\r\n";
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_| {}).unwrap();
        assert_eq!(captured, vec!["one", "two", "three"]);
    }

    #[test]
    fn drain_lines_lossy_non_utf8_bytes_survive_via_replacement() {
        let input: &[u8] = b"valid\n\xffbroken\ntail\n";
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_| {}).unwrap();
        assert_eq!(captured, vec!["valid", "\u{FFFD}broken", "tail"]);
    }

    #[test]
    fn drain_lines_lossy_empty_stream_yields_empty_vec() {
        let input: &[u8] = b"";
        let mut calls = 0usize;
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_| calls += 1).unwrap();
        assert!(captured.is_empty());
        assert_eq!(calls, 0);
    }

    #[test]
    fn drain_lines_lossy_single_line_without_trailing_newline() {
        let input: &[u8] = b"no-newline";
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_| {}).unwrap();
        assert_eq!(captured, vec!["no-newline"]);
    }

    #[test]
    fn drain_lines_lossy_lone_cr_at_eof_is_preserved() {
        let input: &[u8] = b"foo\r";
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_| {}).unwrap();
        assert_eq!(captured, vec!["foo\r"]);
    }

    #[test]
    fn drain_lines_lossy_interior_cr_is_preserved() {
        let input: &[u8] = b"ab\rcd\n";
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_| {}).unwrap();
        assert_eq!(captured, vec!["ab\rcd"]);
    }

    #[test]
    fn drain_lines_lossy_propagates_io_error_after_first_read() {
        use std::io::{BufReader, ErrorKind, Read};

        struct FlakyReader {
            calls: usize,
        }
        impl Read for FlakyReader {
            fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
                self.calls += 1;
                match self.calls {
                    1 => {
                        let data = b"line1\n";
                        let n = data.len().min(buf.len());
                        buf[..n].copy_from_slice(&data[..n]);
                        Ok(n)
                    }
                    _ => Err(std::io::Error::new(ErrorKind::BrokenPipe, "pipe closed")),
                }
            }
        }

        let err = drain_lines_lossy(BufReader::new(FlakyReader { calls: 0 }), |_| {})
            .expect_err("flaky reader must surface Err");
        assert_eq!(err.kind(), ErrorKind::BrokenPipe);
    }

    #[test]
    fn drain_lines_lossy_mixed_lf_and_crlf() {
        let input: &[u8] = b"lf-line\ncrlf-line\r\nlf-again\n";
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_| {}).unwrap();
        assert_eq!(captured, vec!["lf-line", "crlf-line", "lf-again"]);
    }

    #[test]
    fn drain_lines_lossy_empty_lines_lf() {
        let input: &[u8] = b"a\n\nb\n";
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_| {}).unwrap();
        assert_eq!(captured, vec!["a", "", "b"]);
    }

    #[test]
    fn drain_lines_lossy_empty_lines_crlf() {
        let input: &[u8] = b"\r\n\r\n";
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_| {}).unwrap();
        assert_eq!(captured, vec!["", ""]);
    }

    #[test]
    fn drain_lines_lossy_callback_fires_once_per_line_in_order() {
        let input: &[u8] = b"a\nb\nc\n";
        let lens = std::cell::RefCell::new(Vec::<usize>::new());
        let captured = drain_lines_lossy(std::io::Cursor::new(input), |_line| {
            let mut v = lens.borrow_mut();
            let current = v.len();
            v.push(current);
        })
        .unwrap();
        assert_eq!(captured, vec!["a", "b", "c"]);
        assert_eq!(lens.into_inner(), vec![0, 1, 2]);
    }

    // -- run_make_with_output --

    /// `Command::current_dir` on a non-existent path causes
    /// `Command::spawn` to fail before exec, with an underlying
    /// `io::Error` of kind `NotFound`. The wrap via
    /// `.with_context(|| format!("spawn make {}", ...))` must surface
    /// BOTH the `"spawn make <args>"` annotation AND the underlying
    /// `io::Error` with `ErrorKind::NotFound` in the anyhow chain.
    /// `ErrorKind::NotFound` is structural and locale-free; matching
    /// on the rendered "No such file or directory" string would
    /// flake under `LANG=fr_FR.UTF-8`.
    #[test]
    fn run_make_with_output_surfaces_actionable_error_when_kernel_dir_missing() {
        let tmp = tempfile::TempDir::new().unwrap();
        let missing = tmp.path().join("nonexistent_child");
        let err = run_make_with_output(&missing, &["foo"], None)
            .expect_err("nonexistent kernel_dir must surface a spawn failure");
        let rendered = format!("{err:#}");
        assert!(
            rendered.contains("spawn make foo"),
            "expected `spawn make foo` context layer, got: {rendered}"
        );
        let has_not_found = err.chain().any(|e| {
            e.downcast_ref::<std::io::Error>()
                .is_some_and(|io| io.kind() == std::io::ErrorKind::NotFound)
        });
        assert!(
            has_not_found,
            "expected underlying io::Error with ErrorKind::NotFound in anyhow chain, \
             got: {rendered}"
        );
    }

    /// End-to-end exercise of the merged-pipe path against a real
    /// `make` invocation that emits ~200 KiB across stdout+stderr,
    /// past the 64 KiB Linux pipe buffer. Pins both the no-deadlock
    /// invariant (single-pipe + single-reader cannot deadlock) and
    /// the failure-path Err wording (`"make ... failed"` from the
    /// final `bail!`).
    #[test]
    fn run_make_with_output_drains_high_volume_failing_make_without_deadlock() {
        if !make_in_path() {
            skip!("make not in PATH");
        }
        let dir = tempfile::TempDir::new().unwrap();
        let stdout_chunk: String = "S".repeat(1024);
        let stderr_chunk: String = "E".repeat(1024);
        let mut recipe = String::new();
        for _ in 0..100 {
            recipe.push_str(&format!("\t@printf '%s\\n' '{stdout_chunk}'\n"));
            recipe.push_str(&format!("\t@printf '%s\\n' '{stderr_chunk}' >&2\n"));
        }
        let makefile = format!("default:\n{recipe}\t@false\n");
        std::fs::write(dir.path().join("Makefile"), makefile).unwrap();
        let err = run_make_with_output(dir.path(), &["default"], None)
            .expect_err("non-zero exit must surface as Err");
        let rendered = format!("{err:#}");
        assert!(
            rendered.contains("make default failed"),
            "expected `make default failed` wording from bail!, got: {rendered}"
        );
    }

    /// Stderr-only high-volume burst: 128 KiB to stderr alone (2x
    /// the default 64 KiB pipe buffer). No stdout writes — buffer
    /// can only drain via the merged-pipe reader. A regression that
    /// wired stderr to a separate unread pipe would deadlock here.
    #[test]
    fn run_make_with_output_drains_stderr_only_high_volume_without_deadlock() {
        if !make_in_path() {
            skip!("make not in PATH");
        }
        let dir = tempfile::TempDir::new().unwrap();
        let chunk: String = "X".repeat(1024);
        let mut recipe = String::new();
        for _ in 0..128 {
            recipe.push_str(&format!("\t@printf '%s\\n' '{chunk}' >&2\n"));
        }
        let makefile = format!("default:\n{recipe}\t@false\n");
        std::fs::write(dir.path().join("Makefile"), makefile).unwrap();
        let err = run_make_with_output(dir.path(), &["default"], None)
            .expect_err("non-zero exit must surface as Err");
        let rendered = format!("{err:#}");
        assert!(
            rendered.contains("make default failed"),
            "expected `make default failed` wording, got: {rendered}"
        );
    }

    /// Spawn-failure path must not leak the pipe2 OwnedFds. Counts
    /// `/proc/self/fd` entries before and after a guaranteed-spawn-
    /// failure call; the count must not grow over 128 iterations.
    /// A regression that switched to raw fd integers (no Drop) or
    /// consumed write_fd via a path other than Stdio::from would
    /// surface as a 1-3 fd leak per call (128-384 over the loop).
    #[test]
    fn run_make_with_output_releases_fds_on_spawn_failure() {
        let proc_fd = std::path::Path::new("/proc/self/fd");
        if !proc_fd.is_dir() {
            skip!("/proc/self/fd not available");
        }
        let count_fds = || -> usize {
            std::fs::read_dir(proc_fd)
                .expect("read /proc/self/fd")
                .filter_map(|e| e.ok())
                .count()
        };
        let tmp = tempfile::TempDir::new().unwrap();
        let missing = tmp.path().join("nonexistent_child");
        // Warm-up pass: ignore first-call process-wide allocations.
        let _ = run_make_with_output(&missing, &["foo"], None);
        let before = count_fds();
        const FD_LEAK_ITERATIONS: u32 = 128;
        for _ in 0..FD_LEAK_ITERATIONS {
            let _ = run_make_with_output(&missing, &["foo"], None);
        }
        let after = count_fds();
        assert!(
            after <= before,
            "fd leak on spawn failure: {before} -> {after} \
             ({FD_LEAK_ITERATIONS} calls, expected no growth)"
        );
    }

    // -- poll_child_with_timeout --

    fn spawn_sleeping_child(seconds: u64) -> (std::process::Child, u32) {
        let child = std::process::Command::new("sh")
            .arg("-c")
            .arg(format!("sleep {seconds}"))
            .spawn()
            .expect("spawn sh -c sleep N");
        let pid = child.id();
        (child, pid)
    }

    fn pid_is_alive(pid: u32) -> bool {
        use nix::sys::signal::kill;
        use nix::unistd::Pid;
        kill(Pid::from_raw(pid as i32), None).is_ok()
    }

    /// Timeout fires when the child outlives the deadline; the
    /// helper bails with the labeled timeout error AND reaps the
    /// child (no zombie persists past helper return). Three pins:
    /// (1) bail wording carries label + `timed out after`,
    /// (2) elapsed wall-clock stays within a small multiple of the
    /// configured timeout (proves deadline check works),
    /// (3) PID slot is reclaimed (proves child.wait() ran).
    #[test]
    fn poll_child_with_timeout_bails_and_reaps_on_timeout() {
        let (child, pid) = spawn_sleeping_child(60);
        assert!(
            pid_is_alive(pid),
            "fixture precondition: spawned child pid {pid} must be \
             alive before the helper runs",
        );

        let start = std::time::Instant::now();
        let result = poll_child_with_timeout(
            child,
            Duration::from_millis(100),
            Duration::from_millis(1),
            "make wedged-target",
        );
        let elapsed = start.elapsed();

        let err = result.expect_err("timed-out child must surface as Err");
        let rendered = format!("{err:#}");
        assert!(
            rendered.contains("make wedged-target"),
            "timeout bail must include the label parameter; got: {rendered}",
        );
        assert!(
            rendered.contains("timed out after"),
            "timeout bail must include the literal `timed out after` \
             phrase so CI log scrapers can pattern-match wedged builds; \
             got: {rendered}",
        );

        assert!(
            elapsed < Duration::from_secs(5),
            "helper must return within a small multiple of the \
             configured timeout (100ms); took {elapsed:?} which \
             suggests the deadline check is broken",
        );

        let zombie_check_deadline = std::time::Instant::now() + Duration::from_secs(1);
        loop {
            if !pid_is_alive(pid) {
                break;
            }
            if std::time::Instant::now() >= zombie_check_deadline {
                panic!(
                    "child pid {pid} still alive 1s after helper returned — \
                     timeout path leaked a zombie (missing child.wait() \
                     after child.kill()?)",
                );
            }
            std::thread::sleep(Duration::from_millis(10));
        }
    }

    /// Successful pre-deadline exit: the helper observes
    /// `Ok(Some(status))` with success, returns Ok, and reaps via
    /// the natural process-exit path. Pins that the timeout
    /// machinery does not false-fire on a fast-exiting child.
    #[test]
    fn poll_child_with_timeout_succeeds_when_child_exits_clean() {
        let child = std::process::Command::new("true")
            .spawn()
            .expect("spawn true");
        let pid = child.id();

        let result = poll_child_with_timeout(
            child,
            Duration::from_secs(5),
            Duration::from_millis(1),
            "make happy-target",
        );
        assert!(
            result.is_ok(),
            "child that exits 0 must surface as Ok; got: {result:?}",
        );
        let zombie_check_deadline = std::time::Instant::now() + Duration::from_secs(1);
        loop {
            if !pid_is_alive(pid) {
                break;
            }
            if std::time::Instant::now() >= zombie_check_deadline {
                panic!(
                    "child pid {pid} still alive 1s after Ok return — \
                     successful-exit path leaked a zombie",
                );
            }
            std::thread::sleep(Duration::from_millis(10));
        }
    }

    /// Failed pre-deadline exit: the helper observes
    /// `Ok(Some(status))` with non-success and surfaces as Err with
    /// `{label} failed`. Distinct from the timeout case because the
    /// bail wording differs (`failed` vs `timed out after`); CI log
    /// scrapers must distinguish wedged-make from build-failed.
    #[test]
    fn poll_child_with_timeout_surfaces_nonzero_exit_as_err() {
        let child = std::process::Command::new("false")
            .spawn()
            .expect("spawn false");
        let result = poll_child_with_timeout(
            child,
            Duration::from_secs(5),
            Duration::from_millis(1),
            "make broken-target",
        );
        let err = result.expect_err("child that exits non-zero must surface as Err");
        let rendered = format!("{err:#}");
        assert!(
            rendered.contains("make broken-target"),
            "non-zero-exit bail must include the label; got: {rendered}",
        );
        assert!(
            rendered.contains("failed"),
            "non-zero-exit bail must use the `failed` wording so it is \
             distinguishable from the timeout-path's `timed out after`; \
             got: {rendered}",
        );
        assert!(
            !rendered.contains("timed out"),
            "non-zero-exit bail must NOT contain `timed out` — that \
             phrase belongs to the deadline-fired path only; got: {rendered}",
        );
    }

    // -- build_make_args --

    #[test]
    fn cli_build_make_args_single_core() {
        let args = build_make_args(1);
        assert_eq!(args, vec!["-j1", "KCFLAGS=-Wno-error"]);
    }

    #[test]
    fn cli_build_make_args_multi_core() {
        let args = build_make_args(16);
        assert_eq!(args, vec!["-j16", "KCFLAGS=-Wno-error"]);
    }

    // -- run_make_captured --

    /// Spawn failure (nonexistent `current_dir`) surfaces the
    /// `spawn make <args>` context with the underlying
    /// `ErrorKind::NotFound`, the same contract as
    /// [`run_make_with_output`] — proving the capturing+timed path
    /// wraps spawn errors before reaching the drain/poll machinery.
    /// No `make` needed: the failure happens before exec.
    #[test]
    fn run_make_captured_surfaces_error_when_kernel_dir_missing() {
        let tmp = tempfile::TempDir::new().unwrap();
        let missing = tmp.path().join("nonexistent_child");
        let err = run_make_captured(
            &missing,
            &["foo"],
            None,
            Duration::from_secs(5),
            Duration::from_millis(1),
        )
        .expect_err("nonexistent kernel_dir must surface a spawn failure");
        let rendered = format!("{err:#}");
        assert!(
            rendered.contains("spawn make foo"),
            "expected `spawn make foo` context layer, got: {rendered}"
        );
        let has_not_found = err.chain().any(|e| {
            e.downcast_ref::<std::io::Error>()
                .is_some_and(|io| io.kind() == std::io::ErrorKind::NotFound)
        });
        assert!(
            has_not_found,
            "expected underlying io::Error with ErrorKind::NotFound, got: {rendered}"
        );
    }

    /// Clean exit (fake `@true` target) returns Ok — mirrors the
    /// configure step's success path where the spinner must not be
    /// clobbered (output captured, nothing emitted).
    #[test]
    fn run_make_captured_succeeds_on_clean_exit() {
        if !make_in_path() {
            skip!("make not in PATH");
        }
        let dir = tempfile::TempDir::new().unwrap();
        std::fs::write(dir.path().join("Makefile"), "default:\n\t@true\n").unwrap();
        run_make_captured(
            dir.path(),
            &["default"],
            None,
            Duration::from_secs(30),
            Duration::from_millis(1),
        )
        .expect("clean exit must surface as Ok");
    }

    /// Non-zero exit surfaces `make <args> failed` (captured output is
    /// replayed first, then the bail fires). Distinct wording from the
    /// timeout path so CI scrapers can tell build-failed from wedged.
    #[test]
    fn run_make_captured_bails_on_failing_make() {
        if !make_in_path() {
            skip!("make not in PATH");
        }
        let dir = tempfile::TempDir::new().unwrap();
        std::fs::write(
            dir.path().join("Makefile"),
            "default:\n\t@printf 'boom\\n'\n\t@false\n",
        )
        .unwrap();
        let err = run_make_captured(
            dir.path(),
            &["default"],
            None,
            Duration::from_secs(30),
            Duration::from_millis(1),
        )
        .expect_err("non-zero exit must surface as Err");
        let rendered = format!("{err:#}");
        assert!(
            rendered.contains("make default failed"),
            "expected `make default failed`, got: {rendered}"
        );
        assert!(
            !rendered.contains("timed out"),
            "non-zero exit must not use the timeout wording; got: {rendered}"
        );
    }

    /// The timeout path must not hang when a recipe grandchild (here
    /// `sleep`) inherits and holds the merged pipe's write end open.
    /// `process_group(0)` at spawn plus the `killpg` sweep on timeout
    /// kills `make` AND the `sleep`, so the drain thread hits EOF and
    /// joins. A regression that killed only `make` (no group sweep)
    /// would block the drain-thread join until `sleep` exits (~30s),
    /// blowing the sub-5s wall-clock assertion. Pins the `timed out
    /// after` wording too.
    #[test]
    fn run_make_captured_times_out_and_sweeps_group_without_hang() {
        if !make_in_path() {
            skip!("make not in PATH");
        }
        let dir = tempfile::TempDir::new().unwrap();
        std::fs::write(dir.path().join("Makefile"), "default:\n\t@sleep 30\n").unwrap();
        let start = std::time::Instant::now();
        let err = run_make_captured(
            dir.path(),
            &["default"],
            None,
            Duration::from_millis(100),
            Duration::from_millis(1),
        )
        .expect_err("wedged make must surface as Err");
        let elapsed = start.elapsed();
        let rendered = format!("{err:#}");
        assert!(
            rendered.contains("make default"),
            "timeout bail must include the label; got: {rendered}"
        );
        assert!(
            rendered.contains("timed out after"),
            "timeout bail must include `timed out after`; got: {rendered}"
        );
        assert!(
            elapsed < Duration::from_secs(5),
            "run must return promptly after the 100ms timeout — took {elapsed:?}, \
             which means the group sweep did not unblock the output-drain thread \
             (the recipe's `sleep` still held the pipe open)"
        );
    }

    /// High-volume merged output (~200 KiB, past the 64 KiB pipe
    /// buffer) drains without deadlock through the timed capturing
    /// path: the drain thread empties the pipe continuously so the
    /// child never blocks on a full pipe, and the generous timeout
    /// never fires. A regression that read the pipe only after the
    /// child exited would deadlock (child blocks on write, parent
    /// waits for exit).
    #[test]
    fn run_make_captured_drains_high_volume_without_deadlock() {
        if !make_in_path() {
            skip!("make not in PATH");
        }
        let dir = tempfile::TempDir::new().unwrap();
        let stdout_chunk: String = "S".repeat(1024);
        let stderr_chunk: String = "E".repeat(1024);
        let mut recipe = String::new();
        for _ in 0..100 {
            recipe.push_str(&format!("\t@printf '%s\\n' '{stdout_chunk}'\n"));
            recipe.push_str(&format!("\t@printf '%s\\n' '{stderr_chunk}' >&2\n"));
        }
        let makefile = format!("default:\n{recipe}\t@false\n");
        std::fs::write(dir.path().join("Makefile"), makefile).unwrap();
        let err = run_make_captured(
            dir.path(),
            &["default"],
            None,
            Duration::from_secs(30),
            Duration::from_millis(1),
        )
        .expect_err("non-zero exit must surface as Err");
        let rendered = format!("{err:#}");
        assert!(
            rendered.contains("make default failed"),
            "expected `make default failed`, got: {rendered}"
        );
    }

    /// Exercises the `Some(progress)` replay branch (replay_captured
    /// routes each captured line through `FetchProgress::println`,
    /// above the bars). Every other run_make_captured test passes None
    /// (the eprintln fallback), so without this the Some arm is
    /// uncovered — a regression that broke the above-bars routing would
    /// pass CI. Under nextest the group is hidden, so println routes to
    /// stderr (nextest-captured) rather than the bars; the test asserts
    /// the failure still surfaces cleanly with no panic.
    #[test]
    fn run_make_captured_replays_through_progress_group_on_failure() {
        if !make_in_path() {
            skip!("make not in PATH");
        }
        let dir = tempfile::TempDir::new().unwrap();
        std::fs::write(
            dir.path().join("Makefile"),
            "default:\n\t@printf 'boom-via-progress\\n'\n\t@false\n",
        )
        .unwrap();
        let progress = crate::cli::FetchProgress::new();
        let err = run_make_captured(
            dir.path(),
            &["default"],
            Some(&progress),
            Duration::from_secs(30),
            Duration::from_millis(1),
        )
        .expect_err("non-zero exit must surface as Err");
        assert!(
            format!("{err:#}").contains("make default failed"),
            "expected `make default failed`, got: {err:#}"
        );
    }
}