From aec13729f18012eee88146c2c9a1069fbe1227ae Mon Sep 17 00:00:00 2001 From: Rebecca Stambler Date: Mon, 26 Apr 2021 15:13:50 -0400 Subject: [PATCH] gopls/internal/regtest: unskip tests for golang/go#37098 Now that this issue has been resolved, we can unskip the tests for it. Change-Id: I610122a424bedd2cbd066ea9985239fc319e58ae Reviewed-on: https://go-review.googlesource.com/c/tools/+/313532 Trust: Rebecca Stambler Run-TryBot: Rebecca Stambler gopls-CI: kokoro TryBot-Result: Go Bot Reviewed-by: Robert Findley --- .../internal/regtest/diagnostics/diagnostics_test.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gopls/internal/regtest/diagnostics/diagnostics_test.go b/gopls/internal/regtest/diagnostics/diagnostics_test.go index 94b33dd4f0..5ab4f5f0ed 100644 --- a/gopls/internal/regtest/diagnostics/diagnostics_test.go +++ b/gopls/internal/regtest/diagnostics/diagnostics_test.go @@ -8,6 +8,7 @@ import ( "context" "fmt" "log" + "os/exec" "testing" "golang.org/x/tools/gopls/internal/hooks" @@ -1381,7 +1382,15 @@ func b(c bytes.Buffer) { } func TestSwig(t *testing.T) { - t.Skipf("skipped until golang/go#37098 is resolved") + // This is fixed in Go 1.17, but not earlier. + testenv.NeedsGo1Point(t, 17) + + if _, err := exec.LookPath("swig"); err != nil { + t.Skip("skipping test: swig not available") + } + if _, err := exec.LookPath("g++"); err != nil { + t.Skip("skipping test: g++ not available") + } const mod = ` -- go.mod --