From 88831383b4d6f95b74fc588bf8932b6108184280 Mon Sep 17 00:00:00 2001
From: Young-il Choi <duddlf.choi@samsung.com>
Date: Thu, 14 Nov 2013 17:11:11 +0900
Subject: [PATCH 1/4] temporarily disable tests on android and tagging issue
 number #10455

---
 src/libextra/workcache.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libextra/workcache.rs b/src/libextra/workcache.rs
index 89e50f53ab4..9cd9bff8e19 100644
--- a/src/libextra/workcache.rs
+++ b/src/libextra/workcache.rs
@@ -477,6 +477,7 @@ impl<'self, T:Send +
 
 
 #[test]
+#[cfg(not(target_os="android"))] // FIXME(#10455)
 fn test() {
     use std::{os, run};
     use std::io::fs;

From c45870b85e9183a31ab0a0a8a3841977f5f2615f Mon Sep 17 00:00:00 2001
From: Young-il Choi <duddlf.choi@samsung.com>
Date: Fri, 15 Nov 2013 08:34:54 +0900
Subject: [PATCH 2/4] fix #10450

---
 src/test/run-pass/core-run-destroy.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/run-pass/core-run-destroy.rs
index 4a224fd52c9..a24d11a89b0 100644
--- a/src/test/run-pass/core-run-destroy.rs
+++ b/src/test/run-pass/core-run-destroy.rs
@@ -22,13 +22,23 @@ use std::io;
 
 #[test]
 fn test_destroy_once() {
-    let mut p = run::Process::new("echo", [], run::ProcessOptions::new());
+    #[cfg(not(target_os="android"))]
+    static PROG: &'static str = "echo";
+    #[cfg(target_os="android")]
+    static PROG: &'static str = "ls"; // android don't have echo binary
+
+    let mut p = run::Process::new(PROG, [], run::ProcessOptions::new());
     p.destroy(); // this shouldn't crash (and nor should the destructor)
 }
 
 #[test]
 fn test_destroy_twice() {
-    let mut p = run::Process::new("echo", [], run::ProcessOptions::new());
+    #[cfg(not(target_os="android"))]
+    static PROG: &'static str = "echo";
+    #[cfg(target_os="android")]
+    static PROG: &'static str = "ls"; // android don't have echo binary
+
+    let mut p = run::Process::new(PROG, [], run::ProcessOptions::new());
     p.destroy(); // this shouldnt crash...
     do io::io_error::cond.trap(|_| {}).inside {
         p.destroy(); // ...and nor should this (and nor should the destructor)

From 093757ca800bdfbc5b18205e80d055c0ab08202c Mon Sep 17 00:00:00 2001
From: Young-il Choi <duddlf.choi@samsung.com>
Date: Fri, 15 Nov 2013 12:31:58 +0900
Subject: [PATCH 3/4] add path environments

---
 src/etc/adb_run_wrapper.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/etc/adb_run_wrapper.sh b/src/etc/adb_run_wrapper.sh
index 7cbcf94dd40..555944bcff8 100755
--- a/src/etc/adb_run_wrapper.sh
+++ b/src/etc/adb_run_wrapper.sh
@@ -5,8 +5,9 @@
 # Sometimes android shell produce exitcode "1 : Text File Busy"
 # Retry after $WAIT seconds, expecting resource cleaned-up
 WAIT=10
-PATH=$1
-if [ -d "$PATH" ]
+TEST_PATH=$1
+BIN_PATH=/system/bin
+if [ -d "$TEST_PATH" ]
 then
     shift
     RUN=$1
@@ -17,10 +18,10 @@ then
 
         L_RET=1
         L_COUNT=0
-        cd $PATH
+        cd $TEST_PATH
         while [ $L_RET -eq 1 ]
         do
-            TEST_EXEC_ENV=22 LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$PATH/$RUN.stderr
+            TEST_EXEC_ENV=22 LD_LIBRARY_PATH=$TEST_PATH PATH=$BIN_PATH:$TEST_PATH $TEST_PATH/$RUN $@ 1>$TEST_PATH/$RUN.stdout 2>$TEST_PATH/$RUN.stderr
             L_RET=$?
             if [ $L_COUNT -gt 0 ]
             then
@@ -30,7 +31,7 @@ then
             L_COUNT=$((L_COUNT+1))
         done
 
-        echo $L_RET > $PATH/$RUN.exitcode
+        echo $L_RET > $TEST_PATH/$RUN.exitcode
 
     fi
 fi

From 68024eb4eb55ee6bca1279fc755a0b9bc6ec58cd Mon Sep 17 00:00:00 2001
From: Young-il Choi <duddlf.choi@samsung.com>
Date: Mon, 18 Nov 2013 17:47:25 +0900
Subject: [PATCH 4/4] android support added to test case

---
 src/test/run-pass/x86stdcall.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/run-pass/x86stdcall.rs b/src/test/run-pass/x86stdcall.rs
index 21e970e3c87..01370ed12b4 100644
--- a/src/test/run-pass/x86stdcall.rs
+++ b/src/test/run-pass/x86stdcall.rs
@@ -33,4 +33,5 @@ pub fn main() {
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "freebsd")]
+#[cfg(target_os = "android")]
 pub fn main() { }