auto merge of #14571 : bnoordhuis/rust/libtest-check-isatty, r=alexcrichton

bors · bors · commit 064dbb9200d2 · 2014-06-01T00:56:42.000-07:00
Fixes #14570.
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
@@ -868,7 +868,9 @@ fn should_sort_failures_before_printing_them() {
     assert!(apos < bpos);
 }
 
-fn use_color() -> bool { return get_concurrency() == 1; }
+fn use_color() -> bool {
+    get_concurrency() == 1 && io::stdout().get_ref().isatty()
+}
 
 #[deriving(Clone)]
 enum TestEvent {

Original file line number	Diff line number	Diff line change
`@@ -868,7 +868,9 @@ fn should_sort_failures_before_printing_them() {`
`868`	`868`	`assert!(apos < bpos);`
`869`	`869`	`}`
`870`	`870`
`871`		`-fn use_color() -> bool { return get_concurrency() == 1; }`
	`871`	`+fn use_color() -> bool {`
	`872`	`+ get_concurrency() == 1 && io::stdout().get_ref().isatty()`
	`873`	`+}`
`872`	`874`
`873`	`875`	`#[deriving(Clone)]`
`874`	`876`	`enum TestEvent {`