diff options
| author | Austin Clements <austin@google.com> | 2023-05-17 17:59:49 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-05-18 21:19:05 +0000 |
| commit | 78203ac5369b90e115be5d34272450994b0e4544 (patch) | |
| tree | 690436bdedd5c2692b28e6e58290ba267d868823 /src/cmd/dist/test.go | |
| parent | b5515eef565a7d0fd820009fc8c7b282155340a5 (diff) | |
| download | go-78203ac5369b90e115be5d34272450994b0e4544.tar.gz go-78203ac5369b90e115be5d34272450994b0e4544.zip | |
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 <gobot@golang.org>
Auto-Submit: Austin Clements <austin@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Austin Clements <austin@google.com>
Diffstat (limited to 'src/cmd/dist/test.go')
| -rw-r--r-- | src/cmd/dist/test.go | 4 |
1 files changed, 1 insertions, 3 deletions
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 |