Skip to content

Commit 4958272

Browse files
committed
change approach to prevent interleaving compiletest message
1 parent 9a1ff1b commit 4958272

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Diff for: src/bootstrap/render_tests.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//! to reimplement all the rendering logic in this module because of that.
88
99
use crate::builder::Builder;
10-
use std::io::{BufRead, BufReader, Cursor, Write};
10+
use std::io::{BufRead, BufReader, Write};
1111
use std::process::{ChildStdout, Command, Stdio};
1212
use std::time::Duration;
1313
use yansi_term::Color;
@@ -43,7 +43,6 @@ pub(crate) fn try_run_tests(builder: &Builder<'_>, cmd: &mut Command) -> bool {
4343

4444
fn run_tests(builder: &Builder<'_>, cmd: &mut Command) -> bool {
4545
cmd.stdout(Stdio::piped());
46-
cmd.stderr(Stdio::piped());
4746

4847
builder.verbose(&format!("running: {cmd:?}"));
4948

@@ -62,10 +61,6 @@ fn run_tests(builder: &Builder<'_>, cmd: &mut Command) -> bool {
6261
);
6362
}
6463

65-
// Show the stderr emitted by the test runner at the end. As of 2023-03-02 this is only the
66-
// message at the end of a failed compiletest run.
67-
std::io::copy(&mut Cursor::new(&result.stderr), &mut std::io::stderr().lock()).unwrap();
68-
6964
result.status.success()
7065
}
7166

Diff for: src/tools/compiletest/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ pub fn run_tests(config: Config) {
422422
// easy to miss which tests failed, and as such fail to reproduce
423423
// the failure locally.
424424

425-
eprintln!(
425+
println!(
426426
"Some tests failed in compiletest suite={}{} mode={} host={} target={}",
427427
config.suite,
428428
config.compare_mode.map(|c| format!(" compare_mode={:?}", c)).unwrap_or_default(),

0 commit comments

Comments
 (0)