auto merge of #10394 : yichoi/rust/make_check_pass_android, r=brson

To enable test on android bot #9120

some tests are disabled and can be fixed further.

src/librustuv/addrinfo.rs

@@ -191,6 +191,7 @@ mod test {
     use super::super::local_loop;
 
     #[test]
+    #[ignore(cfg(target_os="android"))] // cannot give tcp/ip permission without help of apk
     fn getaddrinfo_test() {
         match GetAddrInfoRequest::run(local_loop(), Some("localhost"), None, None) {
             Ok(infos) => {

src/libstd/rt/io/net/addrinfo.rs

@@ -114,6 +114,7 @@ mod test {
     use super::*;
 
     #[test]
+    #[ignore(cfg(target_os="android"))] // cannot give tcp/ip permission without help of apk
     fn dns_smoke_test() {
         let ipaddrs = get_host_addresses("localhost").unwrap();
         let mut found_local = false;

src/libstd/rt/io/signal.rs

@@ -161,7 +161,7 @@ mod test {
         }
     }
 
-    #[test] #[cfg(unix)]
+    #[test] #[cfg(unix, not(target_os="android"))] // FIXME(#10378)
     fn test_io_signal_smoketest() {
         let mut signal = Listener::new();
         signal.register(Interrupt);
@@ -173,7 +173,7 @@ mod test {
         }
     }
 
-    #[test] #[cfg(unix)]
+    #[test] #[cfg(unix, not(target_os="android"))] // FIXME(#10378)
     fn test_io_signal_two_signal_one_signum() {
         let mut s1 = Listener::new();
         let mut s2 = Listener::new();
@@ -191,7 +191,7 @@ mod test {
         }
     }
 
-    #[test] #[cfg(unix)]
+    #[test] #[cfg(unix, not(target_os="android"))] // FIXME(#10378)
     fn test_io_signal_unregister() {
         let mut s1 = Listener::new();
         let mut s2 = Listener::new();

src/libstd/run.rs

@@ -339,20 +339,14 @@ mod tests {
     use rt::io::{Writer, Reader};
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_process_status() {
         assert_eq!(run::process_status("false", []), 1);
         assert_eq!(run::process_status("true", []), 0);
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_process_status() {
-        assert_eq!(run::process_status("/system/bin/sh", [~"-c",~"false"]), 1);
-        assert_eq!(run::process_status("/system/bin/sh", [~"-c",~"true"]), 0);
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_process_output_output() {
 
         let run::ProcessOutput {status, output, error}
@@ -366,24 +360,9 @@ mod tests {
             assert_eq!(error, ~[]);
         }
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_process_output_output() {
-
-        let run::ProcessOutput {status, output, error}
-             = run::process_output("/system/bin/sh", [~"-c",~"echo hello"]);
-        let output_str = str::from_utf8(output);
-
-        assert_eq!(status, 0);
-        assert_eq!(output_str.trim().to_owned(), ~"hello");
-        // FIXME #7224
-        if !running_on_valgrind() {
-            assert_eq!(error, ~[]);
-        }
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_process_output_error() {
 
         let run::ProcessOutput {status, output, error}
@@ -393,17 +372,6 @@ mod tests {
         assert_eq!(output, ~[]);
         assert!(!error.is_empty());
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_process_output_error() {
-
-        let run::ProcessOutput {status, output, error}
-             = run::process_output("/system/bin/mkdir", [~"."]);
-
-        assert_eq!(status, 255);
-        assert_eq!(output, ~[]);
-        assert!(!error.is_empty());
-    }
 
     #[test]
     #[ignore] // FIXME(#10016) cat never sees stdin close
@@ -454,37 +422,22 @@ mod tests {
     }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_finish_once() {
         let mut prog = run::Process::new("false", [], run::ProcessOptions::new());
         assert_eq!(prog.finish(), 1);
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_finish_once() {
-        let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"false"],
-                                         run::ProcessOptions::new());
-        assert_eq!(prog.finish(), 1);
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_finish_twice() {
         let mut prog = run::Process::new("false", [], run::ProcessOptions::new());
         assert_eq!(prog.finish(), 1);
         assert_eq!(prog.finish(), 1);
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_finish_twice() {
-        let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"false"],
-                                         run::ProcessOptions::new());
-        assert_eq!(prog.finish(), 1);
-        assert_eq!(prog.finish(), 1);
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_finish_with_output_once() {
 
         let mut prog = run::Process::new("echo", [~"hello"], run::ProcessOptions::new());
@@ -499,26 +452,9 @@ mod tests {
             assert_eq!(error, ~[]);
         }
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_finish_with_output_once() {
-
-        let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"echo hello"],
-                                         run::ProcessOptions::new());
-        let run::ProcessOutput {status, output, error}
-            = prog.finish_with_output();
-        let output_str = str::from_utf8(output);
-
-        assert_eq!(status, 0);
-        assert_eq!(output_str.trim().to_owned(), ~"hello");
-        // FIXME #7224
-        if !running_on_valgrind() {
-            assert_eq!(error, ~[]);
-        }
-    }
 
     #[test]
-    #[cfg(not(target_os="android"))]
+    #[cfg(not(target_os="android"))] // FIXME(#10380)
     fn test_finish_with_output_twice() {
 
         let mut prog = run::Process::new("echo", [~"hello"], run::ProcessOptions::new());
@@ -544,34 +480,6 @@ mod tests {
             assert_eq!(error, ~[]);
         }
     }
-    #[test]
-    #[cfg(target_os="android")]
-    fn test_finish_with_output_twice() {
-
-        let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"echo hello"],
-                                         run::ProcessOptions::new());
-        let run::ProcessOutput {status, output, error}
-            = prog.finish_with_output();
-
-        let output_str = str::from_utf8(output);
-
-        assert_eq!(status, 0);
-        assert_eq!(output_str.trim().to_owned(), ~"hello");
-        // FIXME #7224
-        if !running_on_valgrind() {
-            assert_eq!(error, ~[]);
-        }
-
-        let run::ProcessOutput {status, output, error}
-            = prog.finish_with_output();
-
-        assert_eq!(status, 0);
-        assert_eq!(output, ~[]);
-        // FIXME #7224
-        if !running_on_valgrind() {
-            assert_eq!(error, ~[]);
-        }
-    }
 
     #[cfg(unix,not(target_os="android"))]
     fn run_pwd(dir: Option<&Path>) -> run::Process {

src/libstd/unstable/dynamic_lib.rs

@@ -90,6 +90,7 @@ mod test {
 
     #[test]
     #[ignore(cfg(windows))] // FIXME #8818
+    #[ignore(cfg(target_os="android"))] // FIXME(#10379)
     fn test_loading_cosine() {
         // The math library does not need to be loaded since it is already
         // statically linked in

src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-android: FIXME(#10393)
+
 // xfail-pretty the `let to_child` line gets an extra newline
 // multi tasking k-nucleotide
 

src/test/debug-info/basic-types-metadata.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/basic-types.rs

@@ -14,7 +14,7 @@
 // about UTF-32 character encoding and will print a rust char as only
 // its numerical value.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/borrowed-basic.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // Gdb doesn't know about UTF-32 character encoding and will print a rust char as only
 // its numerical value.

src/test/debug-info/borrowed-c-style-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/borrowed-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/boxed-vec.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 #[feature(managed_boxes)];
 

src/test/debug-info/by-value-non-immediate-argument.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/by-value-self-argument-in-trait-impl.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 #[feature(managed_boxes)];
 

src/test/debug-info/c-style-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/closure-in-generic-function.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/destructured-fn-argument.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 #[feature(managed_boxes)];
 

src/test/debug-info/evec-in-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/debug-info/generic-function.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/generic-functions-nested.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/generic-method-on-generic-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/generic-static-method-on-struct-and-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/generic-struct-style-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on

src/test/debug-info/generic-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/generic-tuple-style-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on

src/test/debug-info/lexical-scope-in-for-loop.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/lexical-scope-in-if.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/lexical-scope-in-match.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/lexical-scope-in-parameterless-closure.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z debug-info
 // debugger:run

src/test/debug-info/lexical-scope-in-stack-closure.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/lexical-scope-in-unconditional-loop.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-android: FIXME(#10381)
+
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz
 // debugger:run

src/test/debug-info/lexical-scope-in-unique-closure.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/lexical-scope-in-while.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/lexical-scope-with-macro.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/lexical-scopes-in-block-expression.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/method-on-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/method-on-generic-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/method-on-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/method-on-trait.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/method-on-tuple-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/multiple-functions-equal-var-names.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/multiple-functions.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/name-shadowing-and-scope-nesting.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/nil-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/option-like-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/packed-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/debug-info/recursive-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 #[feature(managed_boxes)];
 

src/test/debug-info/self-in-default-method.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/self-in-generic-default-method.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/shadowed-argument.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/shadowed-variable.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/simple-lexical-scope.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/simple-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/debug-info/simple-tuple.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/debug-info/static-method-on-struct-and-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/struct-in-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on

src/test/debug-info/struct-in-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/debug-info/struct-style-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on

src/test/debug-info/trait-pointers.rs

@@ -10,7 +10,7 @@
 
 #[feature(managed_boxes)];
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:run

src/test/debug-info/tuple-in-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/debug-info/tuple-in-tuple.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/debug-info/tuple-struct.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/debug-info/tuple-style-enum.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print union on

src/test/debug-info/var-captured-in-nested-closure.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/var-captured-in-stack-closure.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:rbreak zzz

src/test/debug-info/vec-slices.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/debug-info/vec.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android
+// xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
 // debugger:set print pretty off

src/test/run-pass/linkage-visibility.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-android: FIXME(#10379)
+
 // aux-build:linkage-visibility.rs
 // xfail-fast windows doesn't like aux-build
 

src/test/run-pass/rtio-processes.rs

@@ -28,6 +28,7 @@ use std::rt::io::process::{Process, ProcessConfig, CreatePipe, Ignored};
 use std::str;
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn smoke() {
     let io = ~[];
@@ -45,6 +46,7 @@ fn smoke() {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn smoke_failure() {
     let io = ~[];
@@ -62,6 +64,7 @@ fn smoke_failure() {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn exit_reported_right() {
     let io = ~[];
@@ -102,6 +105,7 @@ fn run_output(args: ProcessConfig) -> ~str {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn stdout_works() {
     let io = ~[Ignored, CreatePipe(false, true)];
@@ -116,6 +120,7 @@ fn stdout_works() {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn set_cwd_works() {
     let io = ~[Ignored, CreatePipe(false, true)];
@@ -131,6 +136,7 @@ fn set_cwd_works() {
 }
 
 #[test]
+// FIXME(#10380)
 #[cfg(unix, not(target_os="android"))]
 fn stdin_works() {
     let io = ~[CreatePipe(true, false),