@@ -214,14 +214,26 @@ if [[ -n "${junit_report}" ]]; then

     test_output_file="${LOG_DIR}/test-go.log"

     junit_report_file="${ARTIFACT_DIR}/report.xml"

-    # we don't care if 'go test' fails, we want to summarize the output anyway.

-    return_code=0 # default to 0, overwrite only if the following line fails

-    go test ${gotest_flags} ${test_packages} > ${test_output_file} 2>&1 || return_code=$?

-    echo "[INFO] Output from \`go test\` redirected to ${test_output_file}"

-

-    cat "${test_output_file}" | "${junitreport}" --type gotest --suites nested --roots github.com/openshift/origin > "${junit_report_file}"

-    echo "[INFO] jUnit XML report placed at ${junit_report_file}"

+    echo "[INFO] Running \`go test\`..."

+    # we don't care if the `go test` fails in this pipe, as we want to generate the report and summarize the output anyway

+    set +o pipefail

+

+    go test ${gotest_flags} ${test_packages} 2>&1              \

+        | tee ${test_output_file}                              \

+        | "${junitreport}" --type gotest                       \

+                           --suites nested                     \

+                           --roots github.com/openshift/origin \

+                           --stream                            \

+                           --output "${junit_report_file}"

+

+    return_code="${PIPESTATUS[0]}"

+    set -o pipefail

+    

+    echo

     cat "${junit_report_file}" | "${junitreport}" summarize

+    echo "[INFO] Full output from \`go test\` logged at ${test_output_file}"

+    echo "[INFO] jUnit XML report placed at ${junit_report_file}"

+

     exit "${return_code}"

 elif [[ -n "${coverage_output_dir}" ]]; then

@@ -22,12 +22,20 @@ var (

 	// testOutputFile is a flag that holds the path to the file containing test output

 	testOutputFile string

+

+	// outputFile is a flag that holds the path to the jUnit XML report to be written

+	outputFile string

+

+	// stream is a flag that determines if a streamed subset of the input stream should be printed as it is read

+	stream bool

 )

 const (

 	defaultParserType     = "gotest"

 	defaultBuilderType    = "flat"

 	defaultTestOutputFile = "/dev/stdin"

+	defaultOutputFile     = "/dev/stdout"

+	defaultFilter         = false

 )

 func init() {

@@ -35,6 +43,8 @@ func init() {

 	flag.StringVar(&builderType, "suites", defaultBuilderType, "which test suite structure to use")

 	flag.StringVar(&rootSuites, "roots", "", "comma-delimited list of root suite names")

 	flag.StringVar(&testOutputFile, "f", defaultTestOutputFile, "the path to the file containing test output to consume")

+	flag.StringVar(&outputFile, "output", defaultOutputFile, "the path to the jUnit XML output file to write")

+	flag.BoolVar(&stream, "stream", defaultFilter, "print a streamed subset of the input as it is read")

 }

 const (

@@ -55,9 +65,15 @@ parser is greedy, so all output not directly related to a test suite is consider

   # Consume 'go test' output to create a jUnit XML file

   $ go test -v -cover ./... | %[1]s > report.xml

+  # Consume 'go test' output to create a jUnit XML file, while also printing package output as it is generated

+  $ go test -v -cover ./... | %[1]s --stream > report.xml

+

   # Consume 'go test' output from a file to create a jUnit XML file

   $ %[1]s -f testoutput.txt > report.xml

+  # Consume 'go test' output to create a specific jUnit XML file

+  $ %[1]s --output report.xml

+

   # Consume 'go test' output to create a jUnit XML file with nested test suites

   $ go test -v -cover ./... | junitreport --suites=nested > report.xml

@@ -114,10 +130,23 @@ func main() {

 		os.Exit(1)

 	}

+	var output io.Writer

+	if outputFile == defaultOutputFile {

+		output = os.Stdout

+	} else {

+		file, err := os.Create(outputFile)

+		if err != nil {

+			fmt.Fprintf(os.Stderr, "Error creating output file: %v\n", err)

+		}

+		defer file.Close()

+		output = file

+	}

+

 	// Otherwise, we get ready to parse and generate XML output.

 	options := cmd.JUnitReportOptions{

+		Stream: stream,

 		Input:  input,

-		Output: os.Stdout,

+		Output: output,

 	}

 	err := options.Complete(builderType, parserType, rootSuiteNames)

@@ -42,6 +42,9 @@ type JUnitReportOptions struct {

 	// ParserType is the parser type that will be used to parse test output

 	ParserType testParserType

+	// Stream determines if package result lines should be printed to the output as they are found

+	Stream bool

+

 	// Input is the reader for the test output to be parsed

 	Input io.Reader

@@ -83,7 +86,7 @@ func (o *JUnitReportOptions) Run() error {

 	var testParser parser.TestOutputParser

 	switch o.ParserType {

 	case goTestParserType:

-		testParser = gotest.NewParser(builder)

+		testParser = gotest.NewParser(builder, o.Stream)

 	}

 	testSuites, err := testParser.Parse(bufio.NewScanner(o.Input))

@@ -2,6 +2,8 @@ package gotest

 import (

 	"bufio"

+	"fmt"

+	"os"

 	"strings"

 	"github.com/openshift/origin/tools/junitreport/pkg/api"

@@ -10,11 +12,12 @@ import (

 )

 // NewParser returns a new parser that's capable of parsing Go unit test output

-func NewParser(builder builder.TestSuitesBuilder) parser.TestOutputParser {

+func NewParser(builder builder.TestSuitesBuilder, stream bool) parser.TestOutputParser {

 	return &testOutputParser{

 		builder:     builder,

 		testParser:  newTestDataParser(),

 		suiteParser: newTestSuiteDataParser(),

+		stream:      stream,

 	}

 }

@@ -22,6 +25,7 @@ type testOutputParser struct {

 	builder     builder.TestSuitesBuilder

 	testParser  testDataParser

 	suiteParser testSuiteDataParser

+	stream      bool

 }

 // Parse parses `go test -v` output into test suites. Test output from `go test -v` is not bookmarked for packages, so

@@ -89,6 +93,10 @@ func (p *testOutputParser) Parse(input *bufio.Scanner) (*api.TestSuites, error)

 		}

 		if p.suiteParser.MarksCompletion(line) {

+			if p.stream {

+				fmt.Fprintln(os.Stdout, line)

+			}

+

 			p.builder.AddSuite(currentSuite)

 			currentSuite = &api.TestSuite{}

@@ -376,7 +376,7 @@ PASS`,

 	}

 	for _, testCase := range testCases {

-		parser := NewParser(flat.NewTestSuitesBuilder())

+		parser := NewParser(flat.NewTestSuitesBuilder(), false)

 		testFile := "./../../../test/gotest/testdata/" + testCase.testFile

@@ -496,7 +496,7 @@ PASS`, // we include this line greedily even though it does not belong to the te

 	}

 	for _, testCase := range testCases {

-		parser := NewParser(nested.NewTestSuitesBuilder(testCase.rootSuiteNames))

+		parser := NewParser(nested.NewTestSuitesBuilder(testCase.rootSuiteNames), false)

 		testFile := "./../../../test/gotest/testdata/" + testCase.testFile