Skip to content

Handle core dumps output in QEMU user mode #103180

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

Merged
merged 1 commit into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
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
11 changes: 10 additions & 1 deletion src/test/ui/alloc-error/default-alloc-error-hook.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,14 @@ fn main() {
let me = env::current_exe().unwrap();
let output = Command::new(&me).arg("next").output().unwrap();
assert!(!output.status.success(), "{:?} is a success", output.status);
assert_eq!(str::from_utf8(&output.stderr).unwrap(), "memory allocation of 42 bytes failed\n");

let mut stderr = str::from_utf8(&output.stderr).unwrap();

// When running inside QEMU user-mode emulation, there will be an extra message printed by QEMU
// in the stderr whenever a core dump happens. Remove it before the check.
stderr = stderr
.strip_suffix("qemu: uncaught target signal 6 (Aborted) - core dumped\n")
.unwrap_or(stderr);

assert_eq!(stderr, "memory allocation of 42 bytes failed\n");
}
11 changes: 8 additions & 3 deletions src/test/ui/runtime/rt-explody-panic-payloads.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ fn main() {
}.expect("running the command should have succeeded");
println!("{:#?}", output);
let stderr = std::str::from_utf8(&output.stderr);
assert!(stderr.map(|v| {
v.ends_with("fatal runtime error: drop of the panic payload panicked\n")
}).unwrap_or(false));
assert!(stderr
.map(|v| {
// When running inside QEMU user-mode emulation, there will be an extra message printed
// by QEMU in the stderr whenever a core dump happens. Remove it before the check.
v.strip_suffix("qemu: uncaught target signal 6 (Aborted) - core dumped\n").unwrap_or(v)
})
.map(|v| { v.ends_with("fatal runtime error: drop of the panic payload panicked\n") })
.unwrap_or(false));
}