testing: tolerate \r\n as a newline separator in test output

src/cmd/internal/test2json/test2json.go

@@ -138,10 +138,12 @@ func (c *Converter) Exited(err error) {
 
 var (
 	// printed by test on successful run.
-	bigPass = []byte("PASS\n")
+	bigPass     = []byte("PASS\n")
+	bigPassCRLN = []byte("PASS\r\n")
 
 	// printed by test after a normal test failure.
-	bigFail = []byte("FAIL\n")
+	bigFail     = []byte("FAIL\n")
+	bigFailCRLN = []byte("FAIL\r\n")
 
 	// printed by 'go test' along with an error if the test binary terminates
 	// with an error.
@@ -171,10 +173,11 @@ var (
 // before or after emitting other events.
 func (c *Converter) handleInputLine(line []byte) {
 	// Final PASS or FAIL.
-	if bytes.Equal(line, bigPass) || bytes.Equal(line, bigFail) || bytes.HasPrefix(line, bigFailErrorPrefix) {
+	if bytes.Equal(line, bigPass) || bytes.Equal(line, bigPassCRLN) ||
+		bytes.Equal(line, bigFail) || bytes.Equal(line, bigFailCRLN) || bytes.HasPrefix(line, bigFailErrorPrefix) {
 		c.flushReport(0)
 		c.output.write(line)
-		if bytes.Equal(line, bigPass) {
+		if bytes.Equal(line, bigPass) || bytes.Equal(line, bigPassCRLN) {
 			c.result = "pass"
 		} else {
 			c.result = "fail"

src/cmd/internal/test2json/testdata/debugserver.json

@@ -0,0 +1,6 @@
+{"Action":"run","Test":"Test1"}
+{"Action":"output","Test":"Test1","Output":"=== RUN   Test1\r\n"}
+{"Action":"output","Test":"Test1","Output":"--- PASS: Test1 (0.00s)\r\n"}
+{"Action":"pass","Test":"Test1"}
+{"Action":"output","Output":"PASS\r\n"}
+{"Action":"pass"}

src/cmd/internal/test2json/testdata/debugserver.test

@@ -0,0 +1,3 @@
+=== RUN   Test1
+--- PASS: Test1 (0.00s)
+PASS