From 8eb22ecd6d14c99231043e677fe1bf39ce5e043a Mon Sep 17 00:00:00 2001
From: Young-il Choi <duddlf.choi@samsung.com>
Date: Tue, 23 Apr 2013 11:31:54 +0900
Subject: [PATCH] test: fix for missing ARM support

---
 src/test/run-pass/bitwise.rs                  |  1 +
 src/test/run-pass/conditional-compile-arch.rs |  3 +++
 src/test/run-pass/dupe-first-attr.rc          |  3 +++
 src/test/run-pass/intrinsic-alignment.rs      | 11 +++++++++++
 src/test/run-pass/issue-2895.rs               |  1 +
 src/test/run-pass/rec-align-u32.rs            |  1 +
 src/test/run-pass/rec-align-u64.rs            |  9 +++++++++
 src/test/run-pass/struct-return.rs            |  1 +
 src/test/run-pass/x86stdcall2.rs              |  1 +
 9 files changed, 31 insertions(+)

diff --git a/src/test/run-pass/bitwise.rs b/src/test/run-pass/bitwise.rs
index 1a67329ff82b0..ce06f09d32132 100644
--- a/src/test/run-pass/bitwise.rs
+++ b/src/test/run-pass/bitwise.rs
@@ -11,6 +11,7 @@
 
 
 #[cfg(target_arch = "x86")]
+#[cfg(target_arch = "arm")]
 fn target() {
     assert!((-1000 as uint >> 3u == 536870787u));
 }
diff --git a/src/test/run-pass/conditional-compile-arch.rs b/src/test/run-pass/conditional-compile-arch.rs
index a47e9d9ea8117..106f59d7c7860 100644
--- a/src/test/run-pass/conditional-compile-arch.rs
+++ b/src/test/run-pass/conditional-compile-arch.rs
@@ -13,3 +13,6 @@ pub fn main() { }
 
 #[cfg(target_arch = "x86_64")]
 pub fn main() { }
+
+#[cfg(target_arch = "arm")]
+pub fn main() { }
diff --git a/src/test/run-pass/dupe-first-attr.rc b/src/test/run-pass/dupe-first-attr.rc
index f57f18affcb84..d39a2aa447623 100644
--- a/src/test/run-pass/dupe-first-attr.rc
+++ b/src/test/run-pass/dupe-first-attr.rc
@@ -22,3 +22,6 @@ mod hello;
 
 #[cfg(target_os = "freebsd")]
 mod hello;
+
+#[cfg(target_os = "android")]
+mod hello;
diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/run-pass/intrinsic-alignment.rs
index d6a59fac57a4d..adc085d210853 100644
--- a/src/test/run-pass/intrinsic-alignment.rs
+++ b/src/test/run-pass/intrinsic-alignment.rs
@@ -49,3 +49,14 @@ mod m {
         }
     }
 }
+
+#[cfg(target_os = "android")]
+mod m {
+    #[cfg(target_arch = "arm")]
+    pub fn main() {
+        unsafe {
+            assert!(::rusti::pref_align_of::<u64>() == 8u);
+            assert!(::rusti::min_align_of::<u64>() == 4u);
+        }
+    }
+}
diff --git a/src/test/run-pass/issue-2895.rs b/src/test/run-pass/issue-2895.rs
index 2560c1ba77ebc..bd075555df193 100644
--- a/src/test/run-pass/issue-2895.rs
+++ b/src/test/run-pass/issue-2895.rs
@@ -27,6 +27,7 @@ pub fn main() {
 }
 
 #[cfg(target_arch = "x86")]
+#[cfg(target_arch = "arm")]
 pub fn main() {
     assert!((sys::size_of::<Cat>() == 4 as uint));
     assert!((sys::size_of::<Kitty>() == 8 as uint));
diff --git a/src/test/run-pass/rec-align-u32.rs b/src/test/run-pass/rec-align-u32.rs
index 703852d20bd25..ff72eab7df16c 100644
--- a/src/test/run-pass/rec-align-u32.rs
+++ b/src/test/run-pass/rec-align-u32.rs
@@ -32,6 +32,7 @@ struct Outer {
 
 
 #[cfg(target_arch = "x86")]
+#[cfg(target_arch = "arm")]
 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 96713d120be25..0fad3e1f511f8 100644
--- a/src/test/run-pass/rec-align-u64.rs
+++ b/src/test/run-pass/rec-align-u64.rs
@@ -57,6 +57,15 @@ mod m {
     }
 }
 
+#[cfg(target_os = "android")]
+mod m {
+    #[cfg(target_arch = "arm")]
+    pub mod m {
+        pub fn align() -> uint { 4u }
+        pub fn size() -> uint { 12u }
+    }
+}
+
 pub fn main() {
     unsafe {
         let x = Outer {c8: 22u8, t: Inner {c64: 44u64}};
diff --git a/src/test/run-pass/struct-return.rs b/src/test/run-pass/struct-return.rs
index f702ca5144ea8..5427ee38b430c 100644
--- a/src/test/run-pass/struct-return.rs
+++ b/src/test/run-pass/struct-return.rs
@@ -56,6 +56,7 @@ fn test2() {
 }
 
 #[cfg(target_arch = "x86")]
+#[cfg(target_arch = "arm")]
 fn test2() {
 }
 
diff --git a/src/test/run-pass/x86stdcall2.rs b/src/test/run-pass/x86stdcall2.rs
index 452bfbf90b150..53cc483c44f28 100644
--- a/src/test/run-pass/x86stdcall2.rs
+++ b/src/test/run-pass/x86stdcall2.rs
@@ -40,4 +40,5 @@ pub fn main() {
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "freebsd")]
+#[cfg(target_os = "android")]
 pub fn main() { }