From 78203ac5369b90e115be5d34272450994b0e4544 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 17 May 2023 17:59:49 -0400 Subject: cmd/dist: tweaks to -json mode These are some follow-up tweaks to CL 494958. This CL drops a stale and unnecessary check and passes through trailing non-JSON output. Updates #37486. Change-Id: I7cdb73a103f9cd49767d5491812d5ad011ee5c14 Reviewed-on: https://go-review.googlesource.com/c/go/+/496297 TryBot-Result: Gopher Robot Auto-Submit: Austin Clements Reviewed-by: Bryan Mills Run-TryBot: Austin Clements --- src/cmd/dist/test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/cmd/dist/test.go') diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 04dfd22f88..0294a5babb 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -349,9 +349,7 @@ func (opts *goTest) bgCommand(t *tester, stdout, stderr io.Writer) *exec.Cmd { // Rewrite Package in the JSON output to be pkg:variant. For sharded // variants, pkg.TestName is already unambiguous, so we don't need to // rewrite the Package field. - if len(opts.pkgs) != 0 { - panic("cannot combine multiple packages with variants") - } + // // We only want to process JSON on the child's stdout. Ideally if // stdout==stderr, we would also use the same testJSONFilter for // cmd.Stdout and cmd.Stderr in order to keep the underlying -- cgit v1.2.3-54-g00ecf