Skip to content

Commit 8122e49

Browse files
committed
go/pointer: remove use of deprecated ssa.CreateTestMainPackage
For golang/go#48547 Change-Id: Ief1c4fb6302437a8736d52e87541f8229b02289a Reviewed-on: https://go-review.googlesource.com/c/tools/+/363657 Run-TryBot: Zvonimir Pavlinovic <[email protected]> gopls-CI: kokoro <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Bryan C. Mills <[email protected]> Trust: Zvonimir Pavlinovic <[email protected]>
1 parent 1a3081d commit 8122e49

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

go/pointer/stdlib_test.go

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ package pointer
1919

2020
import (
2121
"flag"
22-
"go/build"
2322
"go/token"
2423
"testing"
2524
"time"
2625

27-
"golang.org/x/tools/go/buildutil"
28-
"golang.org/x/tools/go/loader"
26+
"golang.org/x/tools/go/packages"
2927
"golang.org/x/tools/go/ssa"
3028
"golang.org/x/tools/go/ssa/ssautil"
3129
)
@@ -37,22 +35,18 @@ func TestStdlib(t *testing.T) {
3735
t.Skip("skipping (slow) stdlib test (use --stdlib)")
3836
}
3937

40-
// Load, parse and type-check the program.
41-
ctxt := build.Default // copy
42-
ctxt.GOPATH = "" // disable GOPATH
43-
conf := loader.Config{Build: &ctxt}
44-
if _, err := conf.FromArgs(buildutil.AllPackages(conf.Build), true); err != nil {
45-
t.Errorf("FromArgs failed: %v", err)
46-
return
38+
cfg := &packages.Config{
39+
Mode: packages.LoadAllSyntax,
40+
// Create test main packages with a main function.
41+
Tests: true,
4742
}
48-
49-
iprog, err := conf.Load()
50-
if err != nil {
43+
pkgs, err := packages.Load(cfg, "std")
44+
if err != nil || packages.PrintErrors(pkgs) > 0 {
5145
t.Fatalf("Load failed: %v", err)
5246
}
5347

5448
// Create SSA packages.
55-
prog := ssautil.CreateProgram(iprog, 0)
49+
prog, _ := ssautil.AllPackages(pkgs, 0)
5650
prog.Build()
5751

5852
numPkgs := len(prog.AllPackages())
@@ -62,10 +56,9 @@ func TestStdlib(t *testing.T) {
6256

6357
// Determine the set of packages/tests to analyze.
6458
var mains []*ssa.Package
65-
for _, info := range iprog.InitialPackages() {
66-
ssapkg := prog.Package(info.Pkg)
67-
if main := prog.CreateTestMainPackage(ssapkg); main != nil {
68-
mains = append(mains, main)
59+
for _, ssapkg := range prog.AllPackages() {
60+
if ssapkg.Pkg.Name() == "main" && ssapkg.Func("main") != nil {
61+
mains = append(mains, ssapkg)
6962
}
7063
}
7164
if mains == nil {

0 commit comments

Comments
 (0)