diff options
| author | Tim Neumann <mail@timnn.me> | 2017-04-02 11:24:22 +0200 |
|---|---|---|
| committer | Tim Neumann <mail@timnn.me> | 2017-04-23 22:00:02 +0200 |
| commit | a146431e4c8095a3d809517c8abc6b886d5c5b07 (patch) | |
| tree | ad91668940e9e8249a15f0c18710b1066af200c0 | |
| parent | a0ce63be2b5d73411f733509a12702ccec2d173b (diff) | |
| download | rust-a146431e4c8095a3d809517c8abc6b886d5c5b07.tar.gz rust-a146431e4c8095a3d809517c8abc6b886d5c5b07.zip | |
FIN: disable backtrace printing for panic-runtime/abort* on ARM
| -rw-r--r-- | src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs | 12 | ||||
| -rw-r--r-- | src/test/run-pass/panic-runtime/abort.rs | 11 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs b/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs index 1c273fcba02..ebbb00a4a9f 100644 --- a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs +++ b/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs @@ -27,7 +27,17 @@ fn main() { exit_success_if_unwind::bar(do_panic); } } - let s = Command::new(env::args_os().next().unwrap()).arg("foo").status(); + + let mut cmd = Command::new(env::args_os().next().unwrap()); + cmd.arg("foo"); + + + // ARMv6 hanges while printing the backtrace, see #41004 + if cfg!(target_arch = "arm") && cfg!(target_env = "gnu") { + cmd.env("RUST_BACKTRACE", "0"); + } + + let s = cmd.status(); assert!(s.unwrap().code() != Some(0)); } diff --git a/src/test/run-pass/panic-runtime/abort.rs b/src/test/run-pass/panic-runtime/abort.rs index be38f6ea364..3ba3bd61c2e 100644 --- a/src/test/run-pass/panic-runtime/abort.rs +++ b/src/test/run-pass/panic-runtime/abort.rs @@ -35,6 +35,15 @@ fn main() { panic!("try to catch me"); } } - let s = Command::new(env::args_os().next().unwrap()).arg("foo").status(); + + let mut cmd = Command::new(env::args_os().next().unwrap()); + cmd.arg("foo"); + + // ARMv6 hanges while printing the backtrace, see #41004 + if cfg!(target_arch = "arm") && cfg!(target_env = "gnu") { + cmd.env("RUST_BACKTRACE", "0"); + } + + let s = cmd.status(); assert!(s.unwrap().code() != Some(0)); } |