From efaec4e63167fe0b326fc7b607b7600c7a843189 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Wed, 22 Sep 2021 11:14:30 -0400 Subject: [PATCH] go/pointer: skip tests that depend on an unstable API changed in Go 1.18 For golang/go#48547 Change-Id: I211239497c49b152504466dae963a68b0a4f5f6b Reviewed-on: https://go-review.googlesource.com/c/tools/+/351509 Trust: Bryan C. Mills gopls-CI: kokoro Run-TryBot: Bryan C. Mills TryBot-Result: Go Bot Reviewed-by: Jay Conrod --- go/pointer/pointer_go117_test.go | 2 +- go/pointer/pointer_test.go | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go/pointer/pointer_go117_test.go b/go/pointer/pointer_go117_test.go index 7546a06604..bfaafa05eb 100644 --- a/go/pointer/pointer_go117_test.go +++ b/go/pointer/pointer_go117_test.go @@ -35,7 +35,7 @@ func TestSliceToArrayPointer(t *testing.T) { t.Fatalf("couldn't read file '%s': %s", filename, err) } - if !doOneInput(string(content), filename) { + if !doOneInput(t, string(content), filename) { t.Fail() } } diff --git a/go/pointer/pointer_test.go b/go/pointer/pointer_test.go index 2f6e069f27..9c4a2cafde 100644 --- a/go/pointer/pointer_test.go +++ b/go/pointer/pointer_test.go @@ -32,6 +32,7 @@ import ( "golang.org/x/tools/go/ssa" "golang.org/x/tools/go/ssa/ssautil" "golang.org/x/tools/go/types/typeutil" + "golang.org/x/tools/internal/testenv" ) var inputs = []string{ @@ -159,7 +160,10 @@ func findProbe(prog *ssa.Program, probes map[*ssa.CallCommon]bool, queries map[s return // e.g. analysis didn't reach this call } -func doOneInput(input, filename string) bool { +func doOneInput(t *testing.T, input, filename string) bool { + // TODO(#48547): Fix ssa.CreateTestMainPackage and unskip. + testenv.SkipAfterGo1Point(t, 17) + var conf loader.Config // Parsing. @@ -567,7 +571,7 @@ func TestInput(t *testing.T) { continue } - if !doOneInput(string(content), filename) { + if !doOneInput(t, string(content), filename) { ok = false } }