From 909cbbeda81f64fe9d92e2d4fe5325cc9a4a327a Mon Sep 17 00:00:00 2001
From: Johannes Oertel <johannes.oertel@uni-due.de>
Date: Tue, 26 May 2015 23:46:55 +0200
Subject: [PATCH] Enable colored test output when capturing output of tests

The output of individual tests can be captured now so it's safe to use
colorized output even when running tests in parallel. Closes #782.
---
 src/libtest/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index 575f29b3bc97f..da86e727c6874 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -740,7 +740,7 @@ fn should_sort_failures_before_printing_them() {
 
 fn use_color(opts: &TestOpts) -> bool {
     match opts.color {
-        AutoColor => get_concurrency() == 1 && stdout_isatty(),
+        AutoColor => !opts.nocapture && stdout_isatty(),
         AlwaysColor => true,
         NeverColor => false,
     }