]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile/internal/ssa: make _gen an actual submodule and skip it in TestStdlib
authorXiaolin Zhao <zhaoxiaolin@loongson.cn>
Mon, 18 Nov 2024 08:15:36 +0000 (16:15 +0800)
committerDavid Chase <drchase@google.com>
Thu, 21 Nov 2024 20:50:15 +0000 (20:50 +0000)
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 <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: abner chenc <chenguoqi@loongson.cn>
src/cmd/compile/internal/ssa/_gen/go.mod [new file with mode: 0644]
src/cmd/compile/internal/ssa/_gen/go.sum [new file with mode: 0644]
src/cmd/compile/internal/types2/stdlib_test.go
src/go/types/stdlib_test.go

diff --git a/src/cmd/compile/internal/ssa/_gen/go.mod b/src/cmd/compile/internal/ssa/_gen/go.mod
new file mode 100644 (file)
index 0000000..6f750a5
--- /dev/null
@@ -0,0 +1,5 @@
+module _gen
+
+go 1.24
+
+require golang.org/x/tools v0.27.0
diff --git a/src/cmd/compile/internal/ssa/_gen/go.sum b/src/cmd/compile/internal/ssa/_gen/go.sum
new file mode 100644 (file)
index 0000000..6c355a6
--- /dev/null
@@ -0,0 +1,2 @@
+golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
+golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
index 0c63e5d77c89fbf4a16f36ea9b2bc1f7366123ad..6966bb94b00f26feb450aaf0334d88eb2ccabb61 100644 (file)
@@ -354,7 +354,8 @@ func TestStdKen(t *testing.T) {
 
 // Package paths of excluded packages.
 var excluded = map[string]bool{
-       "builtin": true,
+       "builtin":                       true,
+       "cmd/compile/internal/ssa/_gen": true,
 }
 
 // printPackageMu synchronizes the printing of type-checked package files in
index 3b9b2852c462c6d15120840aa2477fe90f0c1ace..ec76f8ee17214059958ad19eb53cde7e16941344 100644 (file)
@@ -356,7 +356,8 @@ func TestStdKen(t *testing.T) {
 
 // Package paths of excluded packages.
 var excluded = map[string]bool{
-       "builtin": true,
+       "builtin":                       true,
+       "cmd/compile/internal/ssa/_gen": true,
 }
 
 // printPackageMu synchronizes the printing of type-checked package files in