about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-10-24 20:20:04 +0200
committerGitHub <noreply@github.com>2019-10-24 20:20:04 +0200
commitefa50378d592b8fdc0eeb8ac48a453e0f1babacf (patch)
treef5a725ba929aed4a51152c1a394ebf0cb5512c73 /src
parent0da94a45e9ebe0fd7f4ca0e7b02eafa73c39a8b4 (diff)
parenteb6d757cb0bb2e4bd81158299a118230b099ac41 (diff)
downloadrust-efa50378d592b8fdc0eeb8ac48a453e0f1babacf.tar.gz
rust-efa50378d592b8fdc0eeb8ac48a453e0f1babacf.zip
Rollup merge of #65729 - Wind-River:master_003, r=alexcrichton
Update test cases for vxWorks
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/intrinsics/intrinsic-alignment.rs3
-rw-r--r--src/test/ui/signal-alternate-stack-cleanup.rs1
-rw-r--r--src/test/ui/structs-enums/rec-align-u64.rs3
3 files changed, 5 insertions, 2 deletions
diff --git a/src/test/ui/intrinsics/intrinsic-alignment.rs b/src/test/ui/intrinsics/intrinsic-alignment.rs
index 6a67d04a54c..02e3139d294 100644
--- a/src/test/ui/intrinsics/intrinsic-alignment.rs
+++ b/src/test/ui/intrinsics/intrinsic-alignment.rs
@@ -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")]
diff --git a/src/test/ui/signal-alternate-stack-cleanup.rs b/src/test/ui/signal-alternate-stack-cleanup.rs
index 787ff51799a..8fef66eac8d 100644
--- a/src/test/ui/signal-alternate-stack-cleanup.rs
+++ b/src/test/ui/signal-alternate-stack-cleanup.rs
@@ -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;
diff --git a/src/test/ui/structs-enums/rec-align-u64.rs b/src/test/ui/structs-enums/rec-align-u64.rs
index c4e9e9ea5ee..680a690ba34 100644
--- a/src/test/ui/structs-enums/rec-align-u64.rs
+++ b/src/test/ui/structs-enums/rec-align-u64.rs
@@ -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 {