From 800adbe2e8932c482f64012349a213bdbf3ef22a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 26 Apr 2021 12:55:09 -0700 Subject: go/packages: enable TestIssue37098 for Go 1.17 and later For golang/go#37098 Change-Id: I6edf1b4efca38fe9837ed944bc45c05c37099b4a Reviewed-on: https://go-review.googlesource.com/c/tools/+/313591 Trust: Ian Lance Taylor Run-TryBot: Ian Lance Taylor gopls-CI: kokoro TryBot-Result: Go Bot Reviewed-by: Heschi Kreinick --- go/packages/packages_test.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'go/packages/packages_test.go') diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go index 06b01f69f..25866ec64 100644 --- a/go/packages/packages_test.go +++ b/go/packages/packages_test.go @@ -2355,7 +2355,16 @@ func testIssue37098(t *testing.T, exporter packagestest.Exporter) { // (*Package).CompiledGoFiles. This tests #37098, where using SWIG to // causes C++ sources to be inadvertently included in // (*Package).CompiledGoFiles. - t.Skip("Issue #37098: SWIG causes generated C++ sources in CompiledGoFiles") + + // 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") + } // Create a fake package with an empty Go source, and a SWIG interface // file. -- cgit v1.2.3