---

yaml
---
r: 63426
b: refs/heads/snap-stage3
c: c4c7e0f
h: refs/heads/master
v: v3

Author: yichoi

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f7ee7d09dd520d5a392de7a28477e50465cce243
+refs/heads/snap-stage3: c4c7e0fb6689f606ec74d9cc29c8e0f7c71fd51c
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/run-pass/core-run-destroy.rs

@@ -42,12 +42,18 @@ fn test_destroy_actually_kills(force: bool) {
     #[cfg(windows)]
     static BLOCK_COMMAND: &'static str = "cmd";
 
-    #[cfg(unix)]
+    #[cfg(unix,not(target_os="android"))]
     fn process_exists(pid: libc::pid_t) -> bool {
         let run::ProcessOutput {output, _} = run::process_output("ps", [~"-p", pid.to_str()]);
         str::from_bytes(output).contains(pid.to_str())
     }
 
+    #[cfg(unix,target_os="android")]
+    fn process_exists(pid: libc::pid_t) -> bool {
+        let run::ProcessOutput {output, _} = run::process_output("/system/bin/ps", [pid.to_str()]);
+        str::from_bytes(output).contains(~"root")
+    }
+
     #[cfg(windows)]
     fn process_exists(pid: libc::pid_t) -> bool {
 

branches/snap-stage3/src/test/run-pass/intrinsic-alignment.rs

@@ -60,7 +60,7 @@ mod m {
     pub fn main() {
         unsafe {
             assert_eq!(::rusti::pref_align_of::<u64>(), 8u);
-            assert_eq!(::rusti::min_align_of::<u64>(), 4u);
+            assert_eq!(::rusti::min_align_of::<u64>(), 8u);
         }
     }
 }

branches/snap-stage3/src/test/run-pass/rec-align-u64.rs

@@ -63,8 +63,8 @@ mod m {
 mod m {
     #[cfg(target_arch = "arm")]
     pub mod m {
-        pub fn align() -> uint { 4u }
-        pub fn size() -> uint { 12u }
+        pub fn align() -> uint { 8u }
+        pub fn size() -> uint { 16u }
     }
 }