Skip to content

Commit

Permalink
Rollup merge of rust-lang#90591 - richlowe:illumos-ui-target, r=Mark-…
Browse files Browse the repository at this point in the history
…Simulacrum

treat illumos like solaris in failing ui tests which need it

Just adding the right cfg target for tests which fail because they don't know illumos is a thing.

(cc ````@jclulow)````
  • Loading branch information
matthiaskrgr authored Nov 8, 2021
2 parents 1373f6a + dbc3bf4 commit 08f2f84
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/test/ui/intrinsics/intrinsic-alignment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ mod rusti {
target_os = "emscripten",
target_os = "freebsd",
target_os = "fuchsia",
target_os = "illumos",
target_os = "linux",
target_os = "macos",
target_os = "netbsd",
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/structs-enums/rec-align-u64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ struct Outer {
target_os = "emscripten",
target_os = "freebsd",
target_os = "fuchsia",
target_os = "illumos",
target_os = "linux",
target_os = "macos",
target_os = "netbsd",
Expand Down
5 changes: 3 additions & 2 deletions src/test/ui/x86stdcall.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ pub fn main() {
target_os = "emscripten",
target_os = "freebsd",
target_os = "fuchsia",
target_os = "illumos",
target_os = "linux",
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "vxworks",
target_os = "solaris"))]
target_os = "solaris",
target_os = "vxworks"))]
pub fn main() { }

0 comments on commit 08f2f84

Please sign in to comment.