diff options
| author | bors <bors@rust-lang.org> | 2014-03-18 11:52:31 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-18 11:52:31 -0700 |
| commit | 891eab94a31739d6b0c330ebb7d4415529cfe1ee (patch) | |
| tree | 6c1c462c4d8c4d4d474256c3942b2e455f1abd3a | |
| parent | af9368452d8578af219713b34f7e3be4bd085186 (diff) | |
| parent | 6a7306fdabd09454e0fa8fec60d783144ea456a1 (diff) | |
| download | rust-891eab94a31739d6b0c330ebb7d4415529cfe1ee.tar.gz rust-891eab94a31739d6b0c330ebb7d4415529cfe1ee.zip | |
auto merge of #12994 : alexcrichton/rust/fix-android, r=huonw
This compile-fail test didn't have a main function for architectures other than x86
| -rw-r--r-- | src/test/compile-fail/asm-misplaced-option.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/compile-fail/asm-misplaced-option.rs b/src/test/compile-fail/asm-misplaced-option.rs index 595247143ed..4f973cbbe25 100644 --- a/src/test/compile-fail/asm-misplaced-option.rs +++ b/src/test/compile-fail/asm-misplaced-option.rs @@ -9,6 +9,8 @@ // except according to those terms. // ignore-fast #[feature] doesn't work with check-fast +// ignore-android + #[feature(asm)]; #[allow(dead_code)]; @@ -33,9 +35,6 @@ pub fn main() { assert_eq!(x, 13); } -// #[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))] -// pub fn main() {} - // At least one error is needed so that compilation fails #[static_assert] static b: bool = false; //~ ERROR static assertion failed |