diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-11-09 22:02:22 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 22:02:22 +0900 |
| commit | 6e39d27a8200d65922b8eecb2d2bfbaab99f88fb (patch) | |
| tree | 44d1550e5f5d1d50373e4b24e732208850257920 | |
| parent | d638c1d13c8fa82a24ed07e8da9dd7c823cc6f13 (diff) | |
| parent | dbc3bf48c48075e3db6b9dc42b6255eefefdb73e (diff) | |
| download | rust-6e39d27a8200d65922b8eecb2d2bfbaab99f88fb.tar.gz rust-6e39d27a8200d65922b8eecb2d2bfbaab99f88fb.zip | |
Rollup merge of #90591 - richlowe:illumos-ui-target, r=Mark-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)`````
| -rw-r--r-- | src/test/ui/intrinsics/intrinsic-alignment.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/structs-enums/rec-align-u64.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/x86stdcall.rs | 5 |
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 5a27ea8783a..6007eba8c09 100644 --- a/src/test/ui/intrinsics/intrinsic-alignment.rs +++ b/src/test/ui/intrinsics/intrinsic-alignment.rs @@ -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", diff --git a/src/test/ui/structs-enums/rec-align-u64.rs b/src/test/ui/structs-enums/rec-align-u64.rs index cc6412e271a..3bc2d16cf9d 100644 --- a/src/test/ui/structs-enums/rec-align-u64.rs +++ b/src/test/ui/structs-enums/rec-align-u64.rs @@ -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", diff --git a/src/test/ui/x86stdcall.rs b/src/test/ui/x86stdcall.rs index 2bf4cfc5003..868923e5932 100644 --- a/src/test/ui/x86stdcall.rs +++ b/src/test/ui/x86stdcall.rs @@ -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() { } |