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
This commit is contained in:
bors 2013-11-06 00:56:08 -08:00
commit dda67dfe27
4 changed files with 9 additions and 4 deletions

View file

@ -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() {}

View file

@ -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() {}

View file

@ -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() {}

View file

@ -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() {}