junit: Output SystemOut and SystemErr contents as CDATA

pkg/junit/junit.go

@@ -50,8 +50,8 @@ type Testsuite struct {
 
 	Properties []Property `xml:"properties>property,omitempty"`
 	Testcases  []Testcase `xml:"testcase,omitempty"`
-	SystemOut  string     `xml:"system-out,omitempty"`
-	SystemErr  string     `xml:"system-err,omitempty"`
+	SystemOut  *Output    `xml:"system-out,omitempty"`
+	SystemErr  *Output    `xml:"system-err,omitempty"`
 }
 
 func (t *Testsuite) AddProperty(name, value string) {
@@ -92,8 +92,8 @@ type Testcase struct {
 	Skipped   *Result `xml:"skipped,omitempty"`
 	Error     *Result `xml:"error,omitempty"`
 	Failure   *Result `xml:"failure,omitempty"`
-	SystemOut string  `xml:"system-out,omitempty"`
-	SystemErr string  `xml:"system-err,omitempty"`
+	SystemOut *Output `xml:"system-out,omitempty"`
+	SystemErr *Output `xml:"system-err,omitempty"`
 }
 
 // Property represents a key/value pair.
@@ -109,6 +109,11 @@ type Result struct {
 	Data    string `xml:",cdata"`
 }
 
+// Output represents output written to stdout or sderr.
+type Output struct {
+	Data string `xml:",cdata"`
+}
+
 // FormatDuration returns the JUnit string representation of the given
 // duration.
 func FormatDuration(d time.Duration) string {

pkg/junit/junit_test.go

@@ -37,12 +37,12 @@ func TestMarshalUnmarshal(t *testing.T) {
 						Skipped:   &Result{Message: "skipped", Type: "type", Data: "data"},
 						Error:     &Result{Message: "error", Type: "type", Data: "data"},
 						Failure:   &Result{Message: "failure", Type: "type", Data: "data"},
-						SystemOut: "system-out",
-						SystemErr: "system-err",
+						SystemOut: &Output{"system-out"},
+						SystemErr: &Output{"system-err"},
 					},
 				},
-				SystemOut: "system-out",
-				SystemErr: "system-err",
+				SystemOut: &Output{"system-out"},
+				SystemErr: &Output{"system-err"},
 			},
 		},
 	}

testdata/33-report.xml

@@ -6,5 +6,8 @@
 		</properties>
 		<testcase classname="flate" name="BenchmarkDecode/Digits/Huffman/1e4" time="0.000104427"></testcase>
 		<testcase classname="flate" name="BenchmarkEncode/Digits/Huffman/1e4" time="0.000028334"></testcase>
+		<system-out><![CDATA[goos: linux
+goarch: amd64
+pkg: compress/flate]]></system-out>
 	</testsuite>
 </testsuites>