Update golden for new go1.14.6 output format

do

@@ -7,13 +7,24 @@ binary() {
     go build -o dist/gotestsum .
 }
 
+binary-static() {
+    echo "building static binary: dist/gotestsum"
+    CGO_ENABLED=0 binary
+}
+
 update-golden() {
-    _update-golden
-    GOLANG_VERSION=1.13-alpine ./do shell bash -c 'go build; PATH=$PATH:. ./do _update-golden'
+    #_update-golden
+    if ldd ./dist/gotestsum > /dev/null 2>&1; then
+        binary-static
+    fi
+    GOLANG_VERSION=1.13-alpine ./do shell ./do _update-golden
+    GOLANG_VERSION=1.14.6-alpine ./do shell ./do _update-golden
 }
 
 _update-golden() {
-    gotestsum -- . ./testjson ./internal/junitxml ./cmd/tool/slowest -test.update-golden
+    PATH="$PWD/dist:$PATH" gotestsum -- \
+        . ./testjson ./internal/junitxml ./cmd/tool/slowest \
+        -test.update-golden
 }
 
 lint() {

main_e2e_test.go

@@ -49,7 +49,7 @@ func TestE2E_RerunFails(t *testing.T) {
 			text.OpRemoveTestElapsedTime,
 			filepath.ToSlash, // for windows
 		)
-		golden.Assert(t, out, expectedFilename(t.Name()))
+		golden.Assert(t, out, "e2e/expected/"+expectedFilename(t.Name()))
 	}
 	var testCases = []testCase{
 		{
@@ -105,10 +105,26 @@ func osEnviron() map[string]string {
 }
 
 func expectedFilename(name string) string {
-	// go1.14 changed how it prints messages from tests. It may be changed back
-	// in go1.15, so special case this version for now.
-	if strings.HasPrefix(runtime.Version(), "go1.14.") {
-		name = name + "-go1.14"
+	ver := runtime.Version()
+	switch {
+	case isPreGo114(ver):
+		return name + "-go1.13"
+	default:
+		return name
 	}
-	return "e2e/expected/" + name
+}
+
+// go1.14.6 changed how it prints messages from tests. go1.14.{0-5} used a format
+// that was different from both go1.14.6 and previous versions of Go. These tests
+// no longer support that format.
+func isPreGo114(ver string) bool {
+	prefix := "go1.1"
+	if !strings.HasPrefix(ver, prefix) || len(ver) < len(prefix)+1 {
+		return false
+	}
+	switch ver[len(prefix)] {
+	case '0', '1', '2', '3':
+		return true
+	}
+	return false
 }

testdata/e2e/expected/TestE2E_RerunFails/reruns_continues_to_fail

@@ -1,18 +1,18 @@
 PASS testdata/e2e/flaky.TestAlwaysPasses
 === RUN   TestFailsRarely
 SEED:  0
---- FAIL: TestFailsRarely
     flaky_test.go:51: not this time
+--- FAIL: TestFailsRarely
 FAIL testdata/e2e/flaky.TestFailsRarely
 === RUN   TestFailsSometimes
 SEED:  0
---- FAIL: TestFailsSometimes
     flaky_test.go:58: not this time
+--- FAIL: TestFailsSometimes
 FAIL testdata/e2e/flaky.TestFailsSometimes
 PASS testdata/e2e/flaky.TestFailsOften/subtest_always_passes
 === RUN   TestFailsOften/subtest_may_fail
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail
 === RUN   TestFailsOften
 SEED:  0
@@ -29,8 +29,8 @@ PASS testdata/e2e/flaky
 PASS testdata/e2e/flaky.TestFailsSometimes (re-run 1)
 PASS testdata/e2e/flaky
 === RUN   TestFailsOften/subtest_may_fail
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 1)
 === RUN   TestFailsOften
 SEED:  3
@@ -41,8 +41,8 @@ FAIL testdata/e2e/flaky
 DONE 2 runs, 12 tests, 6 failures
 
 === RUN   TestFailsOften/subtest_may_fail
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 2)
 === RUN   TestFailsOften
 SEED:  4
@@ -60,22 +60,22 @@ SEED:  0
     flaky_test.go:58: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften
 SEED:  0
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 1)
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 1)
 SEED:  3
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 2)
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 2)
 SEED:  4

testdata/e2e/expected/TestE2E_RerunFails/reruns_continues_to_fail-go1.14 → testdata/e2e/expected/TestE2E_RerunFails/reruns_continues_to_fail-go1.13

@@ -1,18 +1,18 @@
 PASS testdata/e2e/flaky.TestAlwaysPasses
 === RUN   TestFailsRarely
 SEED:  0
-    TestFailsRarely: flaky_test.go:51: not this time
 --- FAIL: TestFailsRarely
+    flaky_test.go:51: not this time
 FAIL testdata/e2e/flaky.TestFailsRarely
 === RUN   TestFailsSometimes
 SEED:  0
-    TestFailsSometimes: flaky_test.go:58: not this time
 --- FAIL: TestFailsSometimes
+    flaky_test.go:58: not this time
 FAIL testdata/e2e/flaky.TestFailsSometimes
 PASS testdata/e2e/flaky.TestFailsOften/subtest_always_passes
 === RUN   TestFailsOften/subtest_may_fail
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail
 === RUN   TestFailsOften
 SEED:  0
@@ -29,8 +29,8 @@ PASS testdata/e2e/flaky
 PASS testdata/e2e/flaky.TestFailsSometimes (re-run 1)
 PASS testdata/e2e/flaky
 === RUN   TestFailsOften/subtest_may_fail
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 1)
 === RUN   TestFailsOften
 SEED:  3
@@ -41,8 +41,8 @@ FAIL testdata/e2e/flaky
 DONE 2 runs, 12 tests, 6 failures
 
 === RUN   TestFailsOften/subtest_may_fail
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 2)
 === RUN   TestFailsOften
 SEED:  4
@@ -53,29 +53,29 @@ FAIL testdata/e2e/flaky
 === Failed
 === FAIL: testdata/e2e/flaky TestFailsRarely
 SEED:  0
-    TestFailsRarely: flaky_test.go:51: not this time
+    flaky_test.go:51: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsSometimes
 SEED:  0
-    TestFailsSometimes: flaky_test.go:58: not this time
+    flaky_test.go:58: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften
 SEED:  0
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 1)
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 1)
 SEED:  3
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 2)
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 2)
 SEED:  4

testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success

@@ -1,18 +1,18 @@
 PASS testdata/e2e/flaky.TestAlwaysPasses
 === RUN   TestFailsRarely
 SEED:  0
---- FAIL: TestFailsRarely
     flaky_test.go:51: not this time
+--- FAIL: TestFailsRarely
 FAIL testdata/e2e/flaky.TestFailsRarely
 === RUN   TestFailsSometimes
 SEED:  0
---- FAIL: TestFailsSometimes
     flaky_test.go:58: not this time
+--- FAIL: TestFailsSometimes
 FAIL testdata/e2e/flaky.TestFailsSometimes
 PASS testdata/e2e/flaky.TestFailsOften/subtest_always_passes
 === RUN   TestFailsOften/subtest_may_fail
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail
 === RUN   TestFailsOften
 SEED:  0
@@ -29,8 +29,8 @@ PASS testdata/e2e/flaky
 PASS testdata/e2e/flaky.TestFailsSometimes (re-run 1)
 PASS testdata/e2e/flaky
 === RUN   TestFailsOften/subtest_may_fail
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 1)
 === RUN   TestFailsOften
 SEED:  3
@@ -41,8 +41,8 @@ FAIL testdata/e2e/flaky
 DONE 2 runs, 12 tests, 6 failures
 
 === RUN   TestFailsOften/subtest_may_fail
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 2)
 === RUN   TestFailsOften
 SEED:  4
@@ -53,8 +53,8 @@ FAIL testdata/e2e/flaky
 DONE 3 runs, 14 tests, 8 failures
 
 === RUN   TestFailsOften/subtest_may_fail
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 3)
 === RUN   TestFailsOften
 SEED:  5
@@ -78,29 +78,29 @@ SEED:  0
     flaky_test.go:58: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften
 SEED:  0
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 1)
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 1)
 SEED:  3
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 2)
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 2)
 SEED:  4
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 3)
+    flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
-        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 3)
 SEED:  5

testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success-go1.14 → testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success-go1.13

@@ -1,18 +1,18 @@
 PASS testdata/e2e/flaky.TestAlwaysPasses
 === RUN   TestFailsRarely
 SEED:  0
-    TestFailsRarely: flaky_test.go:51: not this time
 --- FAIL: TestFailsRarely
+    flaky_test.go:51: not this time
 FAIL testdata/e2e/flaky.TestFailsRarely
 === RUN   TestFailsSometimes
 SEED:  0
-    TestFailsSometimes: flaky_test.go:58: not this time
 --- FAIL: TestFailsSometimes
+    flaky_test.go:58: not this time
 FAIL testdata/e2e/flaky.TestFailsSometimes
 PASS testdata/e2e/flaky.TestFailsOften/subtest_always_passes
 === RUN   TestFailsOften/subtest_may_fail
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail
 === RUN   TestFailsOften
 SEED:  0
@@ -29,8 +29,8 @@ PASS testdata/e2e/flaky
 PASS testdata/e2e/flaky.TestFailsSometimes (re-run 1)
 PASS testdata/e2e/flaky
 === RUN   TestFailsOften/subtest_may_fail
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 1)
 === RUN   TestFailsOften
 SEED:  3
@@ -41,8 +41,8 @@ FAIL testdata/e2e/flaky
 DONE 2 runs, 12 tests, 6 failures
 
 === RUN   TestFailsOften/subtest_may_fail
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 2)
 === RUN   TestFailsOften
 SEED:  4
@@ -53,8 +53,8 @@ FAIL testdata/e2e/flaky
 DONE 3 runs, 14 tests, 8 failures
 
 === RUN   TestFailsOften/subtest_may_fail
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 FAIL testdata/e2e/flaky.TestFailsOften/subtest_may_fail (re-run 3)
 === RUN   TestFailsOften
 SEED:  5
@@ -71,36 +71,36 @@ PASS testdata/e2e/flaky
 === Failed
 === FAIL: testdata/e2e/flaky TestFailsRarely
 SEED:  0
-    TestFailsRarely: flaky_test.go:51: not this time
+    flaky_test.go:51: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsSometimes
 SEED:  0
-    TestFailsSometimes: flaky_test.go:58: not this time
+    flaky_test.go:58: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften
 SEED:  0
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 1)
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 1)
 SEED:  3
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 2)
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 2)
 SEED:  4
 
 === FAIL: testdata/e2e/flaky TestFailsOften/subtest_may_fail (re-run 3)
-    TestFailsOften/subtest_may_fail: flaky_test.go:68: not this time
     --- FAIL: TestFailsOften/subtest_may_fail
+        flaky_test.go:68: not this time
 
 === FAIL: testdata/e2e/flaky TestFailsOften (re-run 3)
 SEED:  5