Skip to content

Commit e9744c9

Browse files
authored
Rollup merge of #143401 - Enselic:no-stack-backtrace-print-in-display, r=davidtwco
tests: Don't check for self-printed output in std-backtrace.rs test The `Display` implementation for `Backtrace` used to print stack backtrace: but that print was since removed. See rust-lang/backtrace-rs#286 and #69042. To make the existing test pass, the print was added to the test instead. But it doesn't make sense to check for something that the test itself does since that will not detect any regressions in the implementation of `Backtrace`. What the test _should_ check is that "stack backtrace:" is _not_ printed in `Display` of `Backtrace`. So do that instead. This is one small steps towards resolving #71706. The next steps after this step involves extending and hardening that test further.
2 parents 2e54f7f + 54cc45d commit e9744c9

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

tests/ui/backtrace/std-backtrace.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ use std::str;
1313
fn main() {
1414
let args: Vec<String> = env::args().collect();
1515
if args.len() >= 2 && args[1] == "force" {
16-
println!("stack backtrace:\n{}", std::backtrace::Backtrace::force_capture());
16+
println!("{}", std::backtrace::Backtrace::force_capture());
1717
} else if args.len() >= 2 {
18-
println!("stack backtrace:\n{}", std::backtrace::Backtrace::capture());
18+
println!("{}", std::backtrace::Backtrace::capture());
1919
} else {
2020
runtest(&args[0]);
2121
println!("test ok");
@@ -28,7 +28,6 @@ fn runtest(me: &str) {
2828

2929
let p = Command::new(me).arg("a").env("RUST_BACKTRACE", "1").output().unwrap();
3030
assert!(p.status.success());
31-
assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
3231
assert!(String::from_utf8_lossy(&p.stdout).contains("backtrace::main"));
3332

3433
let p = Command::new(me).arg("a").env("RUST_BACKTRACE", "0").output().unwrap();
@@ -46,7 +45,6 @@ fn runtest(me: &str) {
4645
.output()
4746
.unwrap();
4847
assert!(p.status.success());
49-
assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
5048

5149
let p = Command::new(me)
5250
.arg("a")
@@ -64,9 +62,7 @@ fn runtest(me: &str) {
6462
.output()
6563
.unwrap();
6664
assert!(p.status.success());
67-
assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
6865

6966
let p = Command::new(me).arg("force").output().unwrap();
7067
assert!(p.status.success());
71-
assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
7268
}

0 commit comments

Comments
 (0)