[dev.garbage] Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: I282fd9ce9db435dfd35e882a9502ab1abc185297

1 files changed, 11 insertions, 5 deletions

diff --git a/src/testing/testing.go b/src/testing/testing.go
index f9bb43b618..3a7a135a3c 100644
--- a/src/testing/testing.go
+++ b/src/testing/testing.go
@@ -199,6 +199,7 @@ type common struct {
 	mu       sync.RWMutex // guards output and failed
 	output   []byte       // Output generated by test or benchmark.
 	w        io.Writer    // For flushToParent.
+	chatty   bool         // A copy of the chatty flag.
 	failed   bool         // Test or benchmark has failed.
 	skipped  bool         // Test of benchmark has been skipped.
 	finished bool
@@ -265,7 +266,6 @@ func (c *common) flushToParent(format string, args ...interface{}) {
 	defer p.mu.Unlock()
 
 	fmt.Fprintf(p.w, format, args...)
-	fmt.Fprintln(p.w)
 
 	c.mu.Lock()
 	defer c.mu.Unlock()
@@ -562,13 +562,18 @@ func (t *T) Run(name string, f func(t *T)) bool {
 			name:    testName,
 			parent:  &t.common,
 			level:   t.level + 1,
+			chatty:  t.chatty,
 		},
 		context: t.context,
 	}
 	t.w = indenter{&t.common}
 
-	if *chatty {
-		fmt.Printf("=== RUN   %s\n", t.name)
+	if t.chatty {
+		// Print directly to root's io.Writer so there is no delay.
+		root := t.parent
+		for ; root.parent != nil; root = root.parent {
+		}
+		fmt.Fprintf(root.w, "=== RUN   %s\n", t.name)
 	}
 	// Instead of reducing the running count of this test before calling the
 	// tRunner and increasing it afterwards, we rely on tRunner keeping the
@@ -690,10 +695,10 @@ func (t *T) report() {
 		return
 	}
 	dstr := fmtDuration(t.duration)
-	format := "--- %s: %s (%s)"
+	format := "--- %s: %s (%s)\n"
 	if t.Failed() {
 		t.flushToParent(format, "FAIL", t.name, dstr)
-	} else if *chatty {
+	} else if t.chatty {
 		if t.Skipped() {
 			t.flushToParent(format, "SKIP", t.name, dstr)
 		} else {
@@ -716,6 +721,7 @@ func RunTests(matchString func(pat, str string) (bool, error), tests []InternalT
 				signal:  make(chan bool),
 				barrier: make(chan bool),
 				w:       os.Stdout,
+				chatty:  *chatty,
 			},
 			context: ctx,
 		}