Skip to content

Commit 5daf6b7

Browse files
committed
temporarily disable tests on android and tagging issue number #10380
1 parent d6f7669 commit 5daf6b7

File tree

2 files changed

+13
-99
lines changed

2 files changed

+13
-99
lines changed

src/libstd/run.rs

Lines changed: 7 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -339,20 +339,14 @@ mod tests {
339339
use rt::io::{Writer, Reader};
340340

341341
#[test]
342-
#[cfg(not(target_os="android"))]
342+
#[cfg(not(target_os="android"))] // FIXME(#10380)
343343
fn test_process_status() {
344344
assert_eq!(run::process_status("false", []), 1);
345345
assert_eq!(run::process_status("true", []), 0);
346346
}
347-
#[test]
348-
#[cfg(target_os="android")]
349-
fn test_process_status() {
350-
assert_eq!(run::process_status("/system/bin/sh", [~"-c",~"false"]), 1);
351-
assert_eq!(run::process_status("/system/bin/sh", [~"-c",~"true"]), 0);
352-
}
353347

354348
#[test]
355-
#[cfg(not(target_os="android"))]
349+
#[cfg(not(target_os="android"))] // FIXME(#10380)
356350
fn test_process_output_output() {
357351

358352
let run::ProcessOutput {status, output, error}
@@ -366,24 +360,9 @@ mod tests {
366360
assert_eq!(error, ~[]);
367361
}
368362
}
369-
#[test]
370-
#[cfg(target_os="android")]
371-
fn test_process_output_output() {
372-
373-
let run::ProcessOutput {status, output, error}
374-
= run::process_output("/system/bin/sh", [~"-c",~"echo hello"]);
375-
let output_str = str::from_utf8(output);
376-
377-
assert_eq!(status, 0);
378-
assert_eq!(output_str.trim().to_owned(), ~"hello");
379-
// FIXME #7224
380-
if !running_on_valgrind() {
381-
assert_eq!(error, ~[]);
382-
}
383-
}
384363
385364
#[test]
386-
#[cfg(not(target_os="android"))]
365+
#[cfg(not(target_os="android"))] // FIXME(#10380)
387366
fn test_process_output_error() {
388367
389368
let run::ProcessOutput {status, output, error}
@@ -393,17 +372,6 @@ mod tests {
393372
assert_eq!(output, ~[]);
394373
assert!(!error.is_empty());
395374
}
396-
#[test]
397-
#[cfg(target_os="android")]
398-
fn test_process_output_error() {
399-
400-
let run::ProcessOutput {status, output, error}
401-
= run::process_output("/system/bin/mkdir", [~"."]);
402-
403-
assert_eq!(status, 255);
404-
assert_eq!(output, ~[]);
405-
assert!(!error.is_empty());
406-
}
407375
408376
#[test]
409377
#[ignore] // FIXME(#10016) cat never sees stdin close
@@ -454,37 +422,22 @@ mod tests {
454422
}
455423
456424
#[test]
457-
#[cfg(not(target_os="android"))]
425+
#[cfg(not(target_os="android"))] // FIXME(#10380)
458426
fn test_finish_once() {
459427
let mut prog = run::Process::new("false", [], run::ProcessOptions::new());
460428
assert_eq!(prog.finish(), 1);
461429
}
462-
#[test]
463-
#[cfg(target_os="android")]
464-
fn test_finish_once() {
465-
let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"false"],
466-
run::ProcessOptions::new());
467-
assert_eq!(prog.finish(), 1);
468-
}
469430
470431
#[test]
471-
#[cfg(not(target_os="android"))]
432+
#[cfg(not(target_os="android"))] // FIXME(#10380)
472433
fn test_finish_twice() {
473434
let mut prog = run::Process::new("false", [], run::ProcessOptions::new());
474435
assert_eq!(prog.finish(), 1);
475436
assert_eq!(prog.finish(), 1);
476437
}
477-
#[test]
478-
#[cfg(target_os="android")]
479-
fn test_finish_twice() {
480-
let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"false"],
481-
run::ProcessOptions::new());
482-
assert_eq!(prog.finish(), 1);
483-
assert_eq!(prog.finish(), 1);
484-
}
485438
486439
#[test]
487-
#[cfg(not(target_os="android"))]
440+
#[cfg(not(target_os="android"))] // FIXME(#10380)
488441
fn test_finish_with_output_once() {
489442
490443
let mut prog = run::Process::new("echo", [~"hello"], run::ProcessOptions::new());
@@ -499,26 +452,9 @@ mod tests {
499452
assert_eq!(error, ~[]);
500453
}
501454
}
502-
#[test]
503-
#[cfg(target_os="android")]
504-
fn test_finish_with_output_once() {
505-
506-
let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"echo hello"],
507-
run::ProcessOptions::new());
508-
let run::ProcessOutput {status, output, error}
509-
= prog.finish_with_output();
510-
let output_str = str::from_utf8(output);
511-
512-
assert_eq!(status, 0);
513-
assert_eq!(output_str.trim().to_owned(), ~"hello");
514-
// FIXME #7224
515-
if !running_on_valgrind() {
516-
assert_eq!(error, ~[]);
517-
}
518-
}
519455
520456
#[test]
521-
#[cfg(not(target_os="android"))]
457+
#[cfg(not(target_os="android"))] // FIXME(#10380)
522458
fn test_finish_with_output_twice() {
523459
524460
let mut prog = run::Process::new("echo", [~"hello"], run::ProcessOptions::new());
@@ -544,34 +480,6 @@ mod tests {
544480
assert_eq!(error, ~[]);
545481
}
546482
}
547-
#[test]
548-
#[cfg(target_os="android")]
549-
fn test_finish_with_output_twice() {
550-
551-
let mut prog = run::Process::new("/system/bin/sh", [~"-c",~"echo hello"],
552-
run::ProcessOptions::new());
553-
let run::ProcessOutput {status, output, error}
554-
= prog.finish_with_output();
555-
556-
let output_str = str::from_utf8(output);
557-
558-
assert_eq!(status, 0);
559-
assert_eq!(output_str.trim().to_owned(), ~"hello");
560-
// FIXME #7224
561-
if !running_on_valgrind() {
562-
assert_eq!(error, ~[]);
563-
}
564-
565-
let run::ProcessOutput {status, output, error}
566-
= prog.finish_with_output();
567-
568-
assert_eq!(status, 0);
569-
assert_eq!(output, ~[]);
570-
// FIXME #7224
571-
if !running_on_valgrind() {
572-
assert_eq!(error, ~[]);
573-
}
574-
}
575483
576484
#[cfg(unix,not(target_os="android"))]
577485
fn run_pwd(dir: Option<&Path>) -> run::Process {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ use std::rt::io::{Reader, Writer};
2828
use std::str;
2929

3030
#[test]
31+
// FIXME(#10380)
3132
#[cfg(unix, not(target_os="android"))]
3233
fn smoke() {
3334
let io = ~[];
@@ -45,6 +46,7 @@ fn smoke() {
4546
}
4647

4748
#[test]
49+
// FIXME(#10380)
4850
#[cfg(unix, not(target_os="android"))]
4951
fn smoke_failure() {
5052
let io = ~[];
@@ -62,6 +64,7 @@ fn smoke_failure() {
6264
}
6365

6466
#[test]
67+
// FIXME(#10380)
6568
#[cfg(unix, not(target_os="android"))]
6669
fn exit_reported_right() {
6770
let io = ~[];
@@ -102,6 +105,7 @@ fn run_output(args: ProcessConfig) -> ~str {
102105
}
103106

104107
#[test]
108+
// FIXME(#10380)
105109
#[cfg(unix, not(target_os="android"))]
106110
fn stdout_works() {
107111
let io = ~[Ignored, CreatePipe(false, true)];
@@ -116,6 +120,7 @@ fn stdout_works() {
116120
}
117121

118122
#[test]
123+
// FIXME(#10380)
119124
#[cfg(unix, not(target_os="android"))]
120125
fn set_cwd_works() {
121126
let io = ~[Ignored, CreatePipe(false, true)];
@@ -131,6 +136,7 @@ fn set_cwd_works() {
131136
}
132137

133138
#[test]
139+
// FIXME(#10380)
134140
#[cfg(unix, not(target_os="android"))]
135141
fn stdin_works() {
136142
let io = ~[CreatePipe(true, false),

0 commit comments

Comments
 (0)