diff --git a/eng/_util/buildutil/buildutil.go b/eng/_util/buildutil/buildutil.go index f8017e75bc..57f57f5b77 100644 --- a/eng/_util/buildutil/buildutil.go +++ b/eng/_util/buildutil/buildutil.go @@ -5,8 +5,6 @@ package buildutil import ( - "bufio" - "encoding/json" "fmt" "io" "log" @@ -125,39 +123,6 @@ func UnassignGOROOT() error { return nil } -// NewStripTestJSONWriter strips all individual test results and output entries from a JSON stream. -// Only the overall package test results are written to the underlying writer. -func NewStripTestJSONWriter(w io.Writer) io.Writer { - pr, pw := io.Pipe() - go func() { - type test struct { - Action string - Package string - Test string - } - sc := bufio.NewScanner(pr) - for sc.Scan() { - var t test - err := json.Unmarshal(sc.Bytes(), &t) - if err == nil && (t.Test != "" || t.Action == "output") { - // Omit the test result. - continue - } - _, err = w.Write(append(sc.Bytes(), '\n')) - if err != nil { - pw.CloseWithError(err) - return - } - } - if err := sc.Err(); err != nil { - pw.CloseWithError(err) - return - } - pw.Close() - }() - return pw -} - // RunCmdMultiWriter runs a command and outputs the stdout to multiple [io.Writer]. // The writers are closed after the command completes. func RunCmdMultiWriter(cmdline []string, stdout ...io.Writer) (err error) { diff --git a/eng/_util/cmd/build/build.go b/eng/_util/cmd/build/build.go index 7054fa854b..b07ab302f2 100644 --- a/eng/_util/cmd/build/build.go +++ b/eng/_util/cmd/build/build.go @@ -223,7 +223,7 @@ func build(o *options) (err error) { err = closeErr } }() - if err := buildutil.RunCmdMultiWriter(testCommandLine, conv, buildutil.NewStripTestJSONWriter(os.Stdout)); err != nil { + if err := buildutil.RunCmdMultiWriter(testCommandLine, conv, os.Stdout); err != nil { return err } } else { diff --git a/eng/_util/cmd/run-builder/run-builder.go b/eng/_util/cmd/run-builder/run-builder.go index 7be8140cd0..917b2e4598 100644 --- a/eng/_util/cmd/run-builder/run-builder.go +++ b/eng/_util/cmd/run-builder/run-builder.go @@ -215,7 +215,7 @@ func main() { log.Fatal(err) } }() - err = buildutil.RunCmdMultiWriter(cmdline, conv, buildutil.NewStripTestJSONWriter(os.Stdout)) + err = buildutil.RunCmdMultiWriter(cmdline, conv, os.Stdout) // If we got an ExitError, the error message was already printed by the command. We just // need to exit with the same exit code. if exitErr, ok := err.(*exec.ExitError); ok {