Skip to content

Commit

Permalink
fix some cfail test cases for arm
Browse files Browse the repository at this point in the history
  • Loading branch information
ksh8281 committed Nov 6, 2013
1 parent b17d4e3 commit 65d35ac
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/test/compile-fail/asm-in-bad-modifier.rs
Expand Up @@ -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;
Expand All @@ -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() {}
3 changes: 2 additions & 1 deletion src/test/compile-fail/asm-out-assign-imm.rs
Expand Up @@ -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
Expand All @@ -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() {}
3 changes: 2 additions & 1 deletion src/test/compile-fail/asm-out-no-modifier.rs
Expand Up @@ -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 {
Expand All @@ -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() {}
3 changes: 2 additions & 1 deletion src/test/compile-fail/asm-out-read-uninit.rs
Expand Up @@ -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 {
Expand All @@ -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() {}

5 comments on commit 65d35ac

@bors
Copy link
Contributor

@bors bors commented on 65d35ac Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from yichoi
at ksh8281@65d35ac

@bors
Copy link
Contributor

@bors bors commented on 65d35ac Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging ksh8281/rust/fix_some_cfail_test_cases_for_arm = 65d35ac into auto

@bors
Copy link
Contributor

@bors bors commented on 65d35ac Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ksh8281/rust/fix_some_cfail_test_cases_for_arm = 65d35ac merged ok, testing candidate = dda67df

@bors
Copy link
Contributor

@bors bors commented on 65d35ac Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 65d35ac Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = dda67df

Please sign in to comment.