Skip to content

Commit b954607

Browse files
authored
Rollup merge of #70600 - danielframpton:aarch64-windows-tests, r=alexcrichton
Ensure there are versions of test code for aarch64 windows Remove the `cfg` flags that were preventing some tests from running on `aarch64-pc-windows-msvc`. All the existing `target_os = windows` targets had the same `align()` and `size()` values, so this change just removes the `target_arch` flags. r? @alexcrichton
2 parents 0203ad2 + d195620 commit b954607

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

src/test/ui/intrinsics/intrinsic-alignment.rs

-10
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,6 @@ mod m {
5656
#[cfg(target_os = "windows")]
5757
mod m {
5858
#[main]
59-
#[cfg(target_arch = "x86")]
60-
pub fn main() {
61-
unsafe {
62-
assert_eq!(::rusti::pref_align_of::<u64>(), 8);
63-
assert_eq!(::rusti::min_align_of::<u64>(), 8);
64-
}
65-
}
66-
67-
#[main]
68-
#[cfg(target_arch = "x86_64")]
6959
pub fn main() {
7060
unsafe {
7161
assert_eq!(::rusti::pref_align_of::<u64>(), 8);

src/test/ui/structs-enums/rec-align-u64.rs

-7
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ mod m {
6767

6868
#[cfg(target_os = "windows")]
6969
mod m {
70-
#[cfg(target_arch = "x86")]
71-
pub mod m {
72-
pub fn align() -> usize { 8 }
73-
pub fn size() -> usize { 16 }
74-
}
75-
76-
#[cfg(target_arch = "x86_64")]
7770
pub mod m {
7871
pub fn align() -> usize { 8 }
7972
pub fn size() -> usize { 16 }

0 commit comments

Comments
 (0)