From 99837c45f0f4fb328488f9d37b34233a2b500311 Mon Sep 17 00:00:00 2001 From: Akos Kiss Date: Fri, 19 Dec 2014 17:35:27 +0000 Subject: [PATCH] Adding AArch64 support to tests. --- src/test/auxiliary/extern_calling_convention.rs | 4 ++-- src/test/compile-fail/asm-in-bad-modifier.rs | 8 ++++++-- src/test/compile-fail/asm-out-assign-imm.rs | 8 ++++++-- src/test/compile-fail/asm-out-no-modifier.rs | 8 ++++++-- src/test/compile-fail/asm-out-read-uninit.rs | 8 ++++++-- src/test/compile-fail/asm-src-loc.rs | 2 +- src/test/run-fail/bug-2470-bounds-check-overflow-3.rs | 2 +- src/test/run-pass/bitwise.rs | 4 ++-- src/test/run-pass/conditional-compile-arch.rs | 5 ++++- src/test/run-pass/intrinsic-alignment.rs | 2 +- src/test/run-pass/issue-2895.rs | 4 ++-- src/test/run-pass/rec-align-u32.rs | 2 +- src/test/run-pass/rec-align-u64.rs | 2 +- src/test/run-pass/struct-return.rs | 2 +- 14 files changed, 40 insertions(+), 21 deletions(-) diff --git a/src/test/auxiliary/extern_calling_convention.rs b/src/test/auxiliary/extern_calling_convention.rs index 1a579dd1b0e2d..e7b45c04ed5c1 100644 --- a/src/test/auxiliary/extern_calling_convention.rs +++ b/src/test/auxiliary/extern_calling_convention.rs @@ -1,4 +1,4 @@ -// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -24,7 +24,7 @@ pub extern "win64" fn foo(a: int, b: int, c: int, d: int) { } #[inline(never)] -#[cfg(any(target_arch = "x86", target_arch = "arm"))] +#[cfg(any(target_arch = "x86", target_arch = "arm", target_arch = "aarch64"))] pub extern fn foo(a: int, b: int, c: int, d: int) { assert!(a == 1); assert!(b == 2); diff --git a/src/test/compile-fail/asm-in-bad-modifier.rs b/src/test/compile-fail/asm-in-bad-modifier.rs index d2216d95867be..fba28a94cca64 100644 --- a/src/test/compile-fail/asm-in-bad-modifier.rs +++ b/src/test/compile-fail/asm-in-bad-modifier.rs @@ -14,7 +14,8 @@ fn foo(x: int) { println!("{}", x); } #[cfg(any(target_arch = "x86", target_arch = "x86_64", - target_arch = "arm"))] + target_arch = "arm", + target_arch = "aarch64"))] pub fn main() { let x: int; let y: int; @@ -26,5 +27,8 @@ pub fn main() { foo(y); } -#[cfg(not(any(target_arch = "x86", target_arch = "x86_64", target_arch = "arm")))] +#[cfg(not(any(target_arch = "x86", + target_arch = "x86_64", + target_arch = "arm", + target_arch = "aarch64")))] pub fn main() {} diff --git a/src/test/compile-fail/asm-out-assign-imm.rs b/src/test/compile-fail/asm-out-assign-imm.rs index a35f72ab4dc7b..0f1c766fed533 100644 --- a/src/test/compile-fail/asm-out-assign-imm.rs +++ b/src/test/compile-fail/asm-out-assign-imm.rs @@ -14,7 +14,8 @@ fn foo(x: int) { println!("{}", x); } #[cfg(any(target_arch = "x86", target_arch = "x86_64", - target_arch = "arm"))] + target_arch = "arm", + target_arch = "aarch64"))] pub fn main() { let x: int; x = 1; //~ NOTE prior assignment occurs here @@ -25,5 +26,8 @@ pub fn main() { foo(x); } -#[cfg(not(any(target_arch = "x86", target_arch = "x86_64", target_arch = "arm")))] +#[cfg(not(any(target_arch = "x86", + target_arch = "x86_64", + target_arch = "arm", + target_arch = "aarch64")))] pub fn main() {} diff --git a/src/test/compile-fail/asm-out-no-modifier.rs b/src/test/compile-fail/asm-out-no-modifier.rs index 76d4c516c4e82..877048c2ca484 100644 --- a/src/test/compile-fail/asm-out-no-modifier.rs +++ b/src/test/compile-fail/asm-out-no-modifier.rs @@ -14,7 +14,8 @@ fn foo(x: int) { println!("{}", x); } #[cfg(any(target_arch = "x86", target_arch = "x86_64", - target_arch = "arm"))] + target_arch = "arm", + target_arch = "aarch64"))] pub fn main() { let x: int; unsafe { @@ -23,5 +24,8 @@ pub fn main() { foo(x); } -#[cfg(not(any(target_arch = "x86", target_arch = "x86_64", target_arch = "arm")))] +#[cfg(not(any(target_arch = "x86", + target_arch = "x86_64", + target_arch = "arm", + target_arch = "aarch64")))] pub fn main() {} diff --git a/src/test/compile-fail/asm-out-read-uninit.rs b/src/test/compile-fail/asm-out-read-uninit.rs index aa83a89fec0a9..477c7e181574d 100644 --- a/src/test/compile-fail/asm-out-read-uninit.rs +++ b/src/test/compile-fail/asm-out-read-uninit.rs @@ -14,7 +14,8 @@ fn foo(x: int) { println!("{}", x); } #[cfg(any(target_arch = "x86", target_arch = "x86_64", - target_arch = "arm"))] + target_arch = "arm", + target_arch = "aarch64"))] pub fn main() { let x: int; unsafe { @@ -23,5 +24,8 @@ pub fn main() { foo(x); } -#[cfg(not(any(target_arch = "x86", target_arch = "x86_64", target_arch = "arm")))] +#[cfg(not(any(target_arch = "x86", + target_arch = "x86_64", + target_arch = "arm", + target_arch = "aarch64")))] pub fn main() {} diff --git a/src/test/compile-fail/asm-src-loc.rs b/src/test/compile-fail/asm-src-loc.rs index b4ebe07776a4d..7a42706312376 100644 --- a/src/test/compile-fail/asm-src-loc.rs +++ b/src/test/compile-fail/asm-src-loc.rs @@ -12,6 +12,6 @@ fn main() { unsafe { - asm!("nowayisthisavalidinstruction"); //~ ERROR invalid instruction + asm!("nowayisthisavalidinstruction"); //~ ERROR instruction } } diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs b/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs index 22a9fffb2fb23..cf3aa429c9b7a 100644 --- a/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs +++ b/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs @@ -32,7 +32,7 @@ fn main() { println!("ov3 0x%x", x.as_slice()[idx]); } -#[cfg(target_arch="x86_64")] +#[cfg(any(target_arch="x86_64", target_arch = "aarch64"))] fn main() { // This version just panics anyways, for symmetry on 64-bit hosts. let x = vec!(1u,2u,3u); diff --git a/src/test/run-pass/bitwise.rs b/src/test/run-pass/bitwise.rs index c2d5f17054d58..151dfcd9af080 100644 --- a/src/test/run-pass/bitwise.rs +++ b/src/test/run-pass/bitwise.rs @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -14,7 +14,7 @@ fn target() { assert_eq!(-1000 as uint >> 3u, 536870787u); } -#[cfg(target_arch = "x86_64")] +#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))] fn target() { assert_eq!(-1000 as uint >> 3u, 2305843009213693827u); } diff --git a/src/test/run-pass/conditional-compile-arch.rs b/src/test/run-pass/conditional-compile-arch.rs index 106f59d7c7860..d2a94c4f94ae6 100644 --- a/src/test/run-pass/conditional-compile-arch.rs +++ b/src/test/run-pass/conditional-compile-arch.rs @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -16,3 +16,6 @@ pub fn main() { } #[cfg(target_arch = "arm")] pub fn main() { } + +#[cfg(target_arch = "aarch64")] +pub fn main() { } diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/run-pass/intrinsic-alignment.rs index 6ab753d526f5d..cd4f0a86d8009 100644 --- a/src/test/run-pass/intrinsic-alignment.rs +++ b/src/test/run-pass/intrinsic-alignment.rs @@ -32,7 +32,7 @@ mod m { } #[main] - #[cfg(any(target_arch = "x86_64", target_arch = "arm"))] + #[cfg(any(target_arch = "x86_64", target_arch = "arm", target_arch = "aarch64"))] pub fn main() { unsafe { assert_eq!(::rusti::pref_align_of::(), 8u); diff --git a/src/test/run-pass/issue-2895.rs b/src/test/run-pass/issue-2895.rs index b9f522f1f8590..0f76ad9faccb8 100644 --- a/src/test/run-pass/issue-2895.rs +++ b/src/test/run-pass/issue-2895.rs @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -22,7 +22,7 @@ impl Drop for Kitty { fn drop(&mut self) {} } -#[cfg(target_arch = "x86_64")] +#[cfg(any(target_arch = "x86_64", target_arch="aarch64"))] pub fn main() { assert_eq!(mem::size_of::(), 8 as uint); assert_eq!(mem::size_of::(), 16 as uint); diff --git a/src/test/run-pass/rec-align-u32.rs b/src/test/run-pass/rec-align-u32.rs index ce8c5df074012..2ad4afa7e243d 100644 --- a/src/test/run-pass/rec-align-u32.rs +++ b/src/test/run-pass/rec-align-u32.rs @@ -36,7 +36,7 @@ struct Outer { } -#[cfg(any(target_arch = "x86", target_arch = "arm"))] +#[cfg(any(target_arch = "x86", target_arch = "arm", target_arch = "aarch64"))] mod m { pub fn align() -> uint { 4u } pub fn size() -> uint { 8u } diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs index c0c7f4c99be73..51d5144e6a4e0 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/run-pass/rec-align-u64.rs @@ -47,7 +47,7 @@ mod m { pub fn size() -> uint { 12u } } - #[cfg(any(target_arch = "x86_64", target_arch = "arm"))] + #[cfg(any(target_arch = "x86_64", target_arch = "arm", target_arch = "aarch64"))] pub mod m { pub fn align() -> uint { 8u } pub fn size() -> uint { 16u } diff --git a/src/test/run-pass/struct-return.rs b/src/test/run-pass/struct-return.rs index bb06aec23f6bc..beb4f6e080ca5 100644 --- a/src/test/run-pass/struct-return.rs +++ b/src/test/run-pass/struct-return.rs @@ -46,7 +46,7 @@ fn test1() { } } -#[cfg(target_arch = "x86_64")] +#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))] fn test2() { unsafe { let f = Floats { a: 1.234567890e-15_f64,