From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 7 Sep 2023 20:57:23 +0000 (-0700)
Subject: cmd/api: don't try to parse JSON from stderr of go list
X-Git-Tag: go1.22rc1~950
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=834a6f9a338b25543cb736ebef03488e8d30a839;p=gostls13.git

cmd/api: don't try to parse JSON from stderr of go list

Just send the go list stderr to our stderr.

Change-Id: Iacda573bbe7accbcecb6a957e5d42b55afd10c58
Reviewed-on: https://go-review.googlesource.com/c/go/+/526775
Reviewed-by: Bryan Mills <bcmills@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
---

diff --git a/src/cmd/api/main_test.go b/src/cmd/api/main_test.go
index f3201e92a9..610ea6331c 100644
--- a/src/cmd/api/main_test.go
+++ b/src/cmd/api/main_test.go
@@ -490,7 +490,8 @@ func (w *Walker) loadImports() {
 		if w.context.Dir != "" {
 			cmd.Dir = w.context.Dir
 		}
-		out, err := cmd.CombinedOutput()
+		cmd.Stderr = os.Stderr
+		out, err := cmd.Output()
 		if err != nil {
 			log.Fatalf("loading imports: %v\n%s", err, out)
 		}