Skip to content

tests: Don't check for self-printed output in std-backtrace.rs test #143401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions tests/ui/backtrace/std-backtrace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ use std::str;
fn main() {
let args: Vec<String> = env::args().collect();
if args.len() >= 2 && args[1] == "force" {
println!("stack backtrace:\n{}", std::backtrace::Backtrace::force_capture());
println!("{}", std::backtrace::Backtrace::force_capture());
} else if args.len() >= 2 {
println!("stack backtrace:\n{}", std::backtrace::Backtrace::capture());
println!("{}", std::backtrace::Backtrace::capture());
} else {
runtest(&args[0]);
println!("test ok");
Expand All @@ -28,7 +28,9 @@ fn runtest(me: &str) {

let p = Command::new(me).arg("a").env("RUST_BACKTRACE", "1").output().unwrap();
assert!(p.status.success());
assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
// Make sure there is no header. The header to use (if any) is up the user.
// See https://github.com/rust-lang/rust/pull/69042.
assert!(!String::from_utf8_lossy(&p.stdout).contains("stack backtrace:"));
assert!(String::from_utf8_lossy(&p.stdout).contains("backtrace::main"));

let p = Command::new(me).arg("a").env("RUST_BACKTRACE", "0").output().unwrap();
Expand All @@ -46,7 +48,7 @@ fn runtest(me: &str) {
.output()
.unwrap();
assert!(p.status.success());
assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
assert!(!String::from_utf8_lossy(&p.stdout).contains("stack backtrace:"));

let p = Command::new(me)
.arg("a")
Expand All @@ -64,9 +66,9 @@ fn runtest(me: &str) {
.output()
.unwrap();
assert!(p.status.success());
assert!(String::from_utf8_lossy(&p.stdout).contains("stack backtrace:\n"));
assert!(!String::from_utf8_lossy(&p.stdout).contains("stack backtrace:"));

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