From: Paul E. Murphy <murp@ibm.com>
Date: Wed, 14 Jun 2023 20:20:11 +0000 (-0500)
Subject: cmd/cgo/internal/testshared: strip newline from gccgo -dumpversion
X-Git-Tag: go1.21rc2~1^2~16
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=23c5e48c4af55da0765413ef4c56360927f0961c;p=gostls13.git

cmd/cgo/internal/testshared: strip newline from gccgo -dumpversion

Otherwise, gccgo tests may be quietly skipped.

For #60798

Change-Id: Iaad6b53c95ad4d407b917d8f62978979b82a4e81
Reviewed-on: https://go-review.googlesource.com/c/go/+/503495
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Paul Murphy <murp@ibm.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
---

diff --git a/src/cmd/cgo/internal/testshared/shared_test.go b/src/cmd/cgo/internal/testshared/shared_test.go
index dc880dd2c7..84c92fca80 100644
--- a/src/cmd/cgo/internal/testshared/shared_test.go
+++ b/src/cmd/cgo/internal/testshared/shared_test.go
@@ -748,7 +748,7 @@ func requireGccgo(t *testing.T) {
 	if dot > 0 {
 		output = output[:dot]
 	}
-	major, err := strconv.Atoi(string(output))
+	major, err := strconv.Atoi(strings.TrimSpace(string(output)))
 	if err != nil {
 		t.Skipf("can't parse gccgo version number %s", output)
 	}