diff options
| author | bors <bors@rust-lang.org> | 2013-11-06 00:56:08 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-06 00:56:08 -0800 |
| commit | dda67dfe27b261babd48a91b1eec1f5f32890d28 (patch) | |
| tree | 365d60b120ddaf28b96463a889edab2fcc65bb03 /src | |
| parent | a66b372eb46e31c27d5b42641a724de99f69d226 (diff) | |
| parent | 65d35ac7453a057c634b20cf67a839db0d195dfe (diff) | |
| download | rust-dda67dfe27b261babd48a91b1eec1f5f32890d28.tar.gz rust-dda67dfe27b261babd48a91b1eec1f5f32890d28.zip | |
auto merge of #10314 : ksh8281/rust/fix_some_cfail_test_cases_for_arm, r=yichoi
adding #[cfg(target_arch = "arm")] for asm of cfail test cases
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/compile-fail/asm-in-bad-modifier.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/asm-out-assign-imm.rs | 3 | ||||
| -rw-r--r-- | src/test/compile-fail/asm-out-no-modifier.rs | 3 | ||||
| -rw-r--r-- | src/test/compile-fail/asm-out-read-uninit.rs | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/test/compile-fail/asm-in-bad-modifier.rs b/src/test/compile-fail/asm-in-bad-modifier.rs index 4e934d98801..e55ca01cc08 100644 --- a/src/test/compile-fail/asm-in-bad-modifier.rs +++ b/src/test/compile-fail/asm-in-bad-modifier.rs @@ -15,6 +15,8 @@ fn foo(x: int) { info!("{}", x); } #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")] +#[cfg(target_arch = "arm")] + pub fn main() { let x: int; let y: int; @@ -26,5 +28,5 @@ pub fn main() { foo(y); } -#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))] +#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"), not(target_arch = "arm"))] 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 599ab76e61c..437cf2f0d7b 100644 --- a/src/test/compile-fail/asm-out-assign-imm.rs +++ b/src/test/compile-fail/asm-out-assign-imm.rs @@ -15,6 +15,7 @@ fn foo(x: int) { info!("{}", x); } #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")] +#[cfg(target_arch = "arm")] pub fn main() { let x: int; x = 1; //~ NOTE prior assignment occurs here @@ -25,5 +26,5 @@ pub fn main() { foo(x); } -#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))] +#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"), not(target_arch = "arm"))] 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 b520c27c80e..1dda4e4ae2d 100644 --- a/src/test/compile-fail/asm-out-no-modifier.rs +++ b/src/test/compile-fail/asm-out-no-modifier.rs @@ -15,6 +15,7 @@ fn foo(x: int) { info!("{}", x); } #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")] +#[cfg(target_arch = "arm")] pub fn main() { let x: int; unsafe { @@ -23,5 +24,5 @@ pub fn main() { foo(x); } -#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))] +#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"), not(target_arch = "arm"))] 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 f49624295b1..11cfffe2475 100644 --- a/src/test/compile-fail/asm-out-read-uninit.rs +++ b/src/test/compile-fail/asm-out-read-uninit.rs @@ -15,6 +15,7 @@ fn foo(x: int) { info!("{}", x); } #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")] +#[cfg(target_arch = "arm")] pub fn main() { let x: int; unsafe { @@ -23,5 +24,5 @@ pub fn main() { foo(x); } -#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))] +#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"), not(target_arch = "arm"))] pub fn main() {} |