Rollup merge of rust-lang#55575 - parched:trap, r=RalfJung

pietroalbini · kennytm · commit 8f4b86d1e797 · 2018-11-01T22:52:21.000+08:00
Fix invalid_const_promotion test on some archs On at least AArch64 `llvm.trap` raises SIGTRAP. r? @RalfJung
diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/run-pass/invalid_const_promotion.rs
@@ -39,6 +39,7 @@ fn check_status(status: std::process::ExitStatus)
     use std::os::unix::process::ExitStatusExt;
 
     assert!(status.signal() == Some(libc::SIGILL)
+            || status.signal() == Some(libc::SIGTRAP)
             || status.signal() == Some(libc::SIGABRT));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ fn check_status(status: std::process::ExitStatus)`
`39`	`39`	`use std::os::unix::process::ExitStatusExt;`
`40`	`40`
`41`	`41`	`assert!(status.signal() == Some(libc::SIGILL)`
	`42`	`+ \|\| status.signal() == Some(libc::SIGTRAP)`
`42`	`43`	`\|\| status.signal() == Some(libc::SIGABRT));`
`43`	`44`	`}`
`44`	`45`