gtr, parser/gotest: Move output formatting out of parser

pkg/gtr/gtr.go

@@ -113,11 +113,11 @@ func JUnit(report Report) junit.Testsuites {
 			if test.Result == Fail {
 				tc.Failure = &junit.Result{
 					Message: "Failed",
-					Data:    strings.Join(test.Output, "\n"),
+					Data:    formatOutput(test.Output),
 				}
 			} else if test.Result == Skip {
 				tc.Skipped = &junit.Result{
-					Message: strings.Join(test.Output, "\n"),
+					Message: formatOutput(test.Output),
 				}
 			}
 
@@ -150,6 +150,16 @@ func JUnit(report Report) junit.Testsuites {
 	return suites
 }
 
+func formatOutput(output []string) string {
+	var lines []string
+	for _, line := range output {
+		line = strings.TrimPrefix(line, "    ")
+		line = strings.TrimPrefix(line, "\t")
+		lines = append(lines, line)
+	}
+	return strings.Join(lines, "\n")
+}
+
 func mergeBenchmarks(benchmarks []Benchmark) []Benchmark {
 	var merged []Benchmark
 

pkg/parser/gotest/gotest.go

@@ -126,8 +126,6 @@ func (p *parser) benchmark(name, iterations, nsPerOp, mbPerSec, bytesPerOp, allo
 }
 
 func (p *parser) output(line string) {
-	line = strings.TrimPrefix(line, "    ")
-	line = strings.TrimPrefix(line, "\t")
 	p.add(gtr.Event{Type: "output", Data: line})
 }