Skip to content

Commit

Permalink
Rollup merge of rust-lang#65729 - Wind-River:master_003, r=alexcrichton
Browse files Browse the repository at this point in the history
Update test cases for vxWorks
  • Loading branch information
Centril committed Oct 24, 2019
2 parents b6750dd + eb6d757 commit 92cbe5a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/test/ui/intrinsics/intrinsic-alignment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ mod rusti {
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris"))]
target_os = "solaris",
target_os = "vxworks"))]
mod m {
#[main]
#[cfg(target_arch = "x86")]
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/signal-alternate-stack-cleanup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// ignore-wasm32-bare no libc
// ignore-windows
// ignore-sgx no libc
// ignore-vxworks no SIGWINCH in user space

#![feature(rustc_private)]
extern crate libc;
Expand Down
3 changes: 2 additions & 1 deletion src/test/ui/structs-enums/rec-align-u64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ struct Outer {
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris"))]
target_os = "solaris",
target_os = "vxworks"))]
mod m {
#[cfg(target_arch = "x86")]
pub mod m {
Expand Down

0 comments on commit 92cbe5a

Please sign in to comment.