From 55c0561ed1385c36dbbb24d3c0ff47bdc048482d Mon Sep 17 00:00:00 2001
From: Anthony Yeh <enisoc@google.com>
Date: Sun, 23 Aug 2015 22:11:48 -0700
Subject: [PATCH] travis: turn off -follow for now to reduce spam in the happy
 case.

---
 .travis.yml | 3 ++-
 test.go     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cb1739674d..da09ba58d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,7 +66,8 @@ env:
     - VT_GO_PARALLEL=4
     - PHP_FLAGS="-d extension=$HOME/php/mongo.so"
     - PATH="$HOME/php:$PATH"
-    - TEST_FLAGS="-docker=false -timeout 5m -follow -remote-stats http://enisoc.com:15123/travis/stats"
+    # Add -follow to TEST_FLAGS below to print as the test runs, to diagnose stuck tests.
+    - TEST_FLAGS="-docker=false -timeout=5m -print-log -remote-stats=http://enisoc.com:15123/travis/stats"
   matrix:
     # NOTE: Travis CI schedules up to 5 tests simultaneously.
     #       All our tests should be spread out as evenly as possible across these 5 slots.
diff --git a/test.go b/test.go
index beb0be28e5..887506cdda 100755
--- a/test.go
+++ b/test.go
@@ -345,7 +345,7 @@ func main() {
 
 				// Save/print test output.
 				if err != nil || *logPass {
-					if *printLog {
+					if *printLog && !*follow {
 						test.logf("%s\n", output)
 					}
 					outFile := fmt.Sprintf("%v-%v.%v.log", test.name, test.runIndex+1, try)