Skip to content

Commit efe0a86

Browse files
sophie-zhaodr2chase
authored andcommitted
cmd/compile/internal/ssa: make _gen an actual submodule and skip it in TestStdlib
After tools CL 612038, the package astutil stops being vendored, but _gen/rulegen.go needs to import this package. In particular, after update golang.org/x/tools, the package astutil is deleted from the vendor directory, and got error when run TestStdlib in longtest. So in this CL, we make _gen an actual submodule and skip it in TestStdlib. Change-Id: I76f77b66427f6490b4746698711a6e307ad2ba79 Reviewed-on: https://go-review.googlesource.com/c/go/+/629015 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Cherry Mui <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: abner chenc <[email protected]>
1 parent 6a7733a commit efe0a86

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module _gen
2+
3+
go 1.24
4+
5+
require golang.org/x/tools v0.27.0
+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
2+
golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=

src/cmd/compile/internal/types2/stdlib_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,8 @@ func TestStdKen(t *testing.T) {
354354

355355
// Package paths of excluded packages.
356356
var excluded = map[string]bool{
357-
"builtin": true,
357+
"builtin": true,
358+
"cmd/compile/internal/ssa/_gen": true,
358359
}
359360

360361
// printPackageMu synchronizes the printing of type-checked package files in

src/go/types/stdlib_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@ func TestStdKen(t *testing.T) {
356356

357357
// Package paths of excluded packages.
358358
var excluded = map[string]bool{
359-
"builtin": true,
359+
"builtin": true,
360+
"cmd/compile/internal/ssa/_gen": true,
360361
}
361362

362363
// printPackageMu synchronizes the printing of type-checked package files in

0 commit comments

Comments
 (0)