internal/trace/internal/testgen: force trace version selection

Currently testgen only generates Go 1.22 tests. Allow generating tests
for different versions, especially now that we've tightened up which
events can be emitted by different versions.

Change-Id: Ia64309c6934f34eace03b3229d05fca5acfc7366
Reviewed-on: https://go-review.googlesource.com/c/go/+/644220
Reviewed-by: Michael Pratt <mpratt@google.com>
Auto-Submit: Michael Knyszek <mknyszek@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/internal/trace/internal/testgen/trace.go b/src/internal/trace/internal/testgen/trace.go
index 9e797da509d81eedd2dd473511c6f20bd530d019..19d76d1367f6dfb51d54c458f54376156cca6246 100644 (file)
--- a/src/internal/trace/internal/testgen/trace.go
+++ b/src/internal/trace/internal/testgen/trace.go
@@ -20,7 +20,7 @@ import (
        "internal/txtar"
 )
 
-func Main(f func(*Trace)) {
+func Main(ver version.Version, f func(*Trace)) {
        // Create an output file.
        out, err := os.Create(os.Args[1])
        if err != nil {
@@ -29,7 +29,7 @@ func Main(f func(*Trace)) {
        defer out.Close()
 
        // Create a new trace.
-       trace := NewTrace()
+       trace := NewTrace(ver)
 
        // Call the generator.
        f(trace)
@@ -63,8 +63,7 @@ type Trace struct {
 }
 
 // NewTrace creates a new trace.
-func NewTrace() *Trace {
-       ver := version.Go122
+func NewTrace(ver version.Version) *Trace {
        return &Trace{
                names:           event.Names(ver.Specs()),
                specs:           ver.Specs(),

diff --git a/src/internal/trace/testdata/generators/go122-confuse-seq-across-generations.go b/src/internal/trace/testdata/generators/go122-confuse-seq-across-generations.go
index 30f859779011d6a8a3adc9a4526959953c155e69..9b98723c4de8b124d4f856ae9ad238525bceae84 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-confuse-seq-across-generations.go
+++ b/src/internal/trace/testdata/generators/go122-confuse-seq-across-generations.go
@@ -25,10 +25,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-create-syscall-reuse-thread-id.go b/src/internal/trace/testdata/generators/go122-create-syscall-reuse-thread-id.go
index cdb53785b09ef132d0339d279d9026df945c4a8d..dc5c4a52572caf578684b8591b0c143bc933b3b1 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-create-syscall-reuse-thread-id.go
+++ b/src/internal/trace/testdata/generators/go122-create-syscall-reuse-thread-id.go
@@ -27,10 +27,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-create-syscall-with-p.go b/src/internal/trace/testdata/generators/go122-create-syscall-with-p.go
index ba74144e92a01c93d1772e381c5c846265d49f19..90729d7c528881690223e6ef7e7ff32cd734da21 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-create-syscall-with-p.go
+++ b/src/internal/trace/testdata/generators/go122-create-syscall-with-p.go
@@ -18,10 +18,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-fail-first-gen-first.go b/src/internal/trace/testdata/generators/go122-fail-first-gen-first.go
index ab396fcd4af33d81df624569afe94802b87acdcc..c8ead6772c0dcb68c651add421dd37753e7df9f7 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-fail-first-gen-first.go
+++ b/src/internal/trace/testdata/generators/go122-fail-first-gen-first.go
@@ -21,10 +21,11 @@ package main
 import (
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-go-create-without-running-g.go b/src/internal/trace/testdata/generators/go122-go-create-without-running-g.go
index 3ce4f0243d06723f9e46c13fd59803056b8a9762..2e9b571d46eccab3e78932f9507a021c1b79678c 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-go-create-without-running-g.go
+++ b/src/internal/trace/testdata/generators/go122-go-create-without-running-g.go
@@ -15,10 +15,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-ambiguous.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-ambiguous.go
index 57d2a1a126bc27699238541ef744a30660dea9a5..28d187c37e4782de202ab4df0135a36072488194 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-ambiguous.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-ambiguous.go
@@ -17,10 +17,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-bare-m.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-bare-m.go
index e4f97ba530446465bb90978fab3274c80da05502..5350b197404fe1851f1bd28485e21eed876946b0 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-bare-m.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-bare-m.go
@@ -10,10 +10,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc-bare-m.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc-bare-m.go
index fc8549814f1cbe52fc1c963d5eae2651f1b3473a..f7611c5c0824c54e21fe6a456a342330351e416d 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc-bare-m.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc-bare-m.go
@@ -10,10 +10,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc.go
index 6a4f8bd1e31ff1ee1adc01206a9d1a918fe50bd9..521363b0942b9998810000ad8d6bb76bf46a900f 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc.go
@@ -10,10 +10,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary.go
index 0660996f3f67d3e04a767aa92b4286888bf27cd3..6c171c9cd1f89e3019e900f88adabf3536ed12bc 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary.go
@@ -10,10 +10,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc-bare-m.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc-bare-m.go
index 4a286b5eeab2271048b150e3b5c51cef0efa2647..18493dd5c383aa0eae6d196249a5fcf0fdc2f7f0 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc-bare-m.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc-bare-m.go
@@ -10,10 +10,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc.go
index 98ab35bad60107e6cf5a9e67cede180359a303b6..d4e6ed3e2a2ed4d5cff2c20b655798390a6b5dd7 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc.go
@@ -10,10 +10,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-self.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-self.go
index 2c5aac39d693b4111d5852790f87959effb0b0ff..6dfb465b0a1819c8da04e884a752428b59edb30e 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-self.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-self.go
@@ -14,10 +14,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple-bare-m.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple-bare-m.go
index 91dfa3774022e3f7d9aa33e37be378163f641273..ac314a6647804987d7fee36333d303d72ca404c3 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple-bare-m.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple-bare-m.go
@@ -10,10 +10,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple.go
index e09a70c7c9a6717fbf54167f6f93df8bd80d4fb2..010272e5523c178d9eb4badaa3d90f2786b0c782 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple.go
@@ -10,10 +10,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-sitting-in-syscall.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-sitting-in-syscall.go
index d3600e43e8e7b639e9521c09550d036d89dfb96a..410f9b7a089be88dd16bd3a912ab56b1dd43066f 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-sitting-in-syscall.go
+++ b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-sitting-in-syscall.go
@@ -11,10 +11,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {

diff --git a/src/internal/trace/testdata/generators/go122-task-across-generations.go b/src/internal/trace/testdata/generators/go122-task-across-generations.go
index 644176a1e3093aac63fb80e3c09049f8ca71e25e..e8def318b403c5973f77c1e201a4328f47319ce8 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-task-across-generations.go
+++ b/src/internal/trace/testdata/generators/go122-task-across-generations.go
@@ -16,10 +16,11 @@ import (
        "internal/trace"
        "internal/trace/internal/testgen"
        "internal/trace/tracev2"
+       "internal/trace/version"
 )
 
 func main() {
-       testgen.Main(gen)
+       testgen.Main(version.Go122, gen)
 }
 
 func gen(t *testgen.Trace) {