diff --git a/sweet/cmd/sweet/benchmark.go b/sweet/cmd/sweet/benchmark.go index 8ad98a0..055b8d8 100644 --- a/sweet/cmd/sweet/benchmark.go +++ b/sweet/cmd/sweet/benchmark.go @@ -108,8 +108,7 @@ var benchmarkGroups = func() map[string][]*benchmark { allBenchmarksMap["fogleman-pt"], allBenchmarksMap["go-build"], allBenchmarksMap["gopher-lua"], - // TODO(go.dev/issue/51445): Enable once gVisor builds with Go 1.19. - // allBenchmarksMap["gvisor"], + allBenchmarksMap["gvisor"], allBenchmarksMap["markdown"], allBenchmarksMap["tile38"], } @@ -126,10 +125,6 @@ var benchmarkGroups = func() map[string][]*benchmark { // hangs on arm64. continue } - case "gvisor": - // TODO(go.dev/issue/51445): Include in "all" - // once gVisor builds with Go 1.19. - continue } m["all"] = append(m["all"], &allBenchmarks[i]) } diff --git a/sweet/cmd/sweet/integration_test.go b/sweet/cmd/sweet/integration_test.go index 544a654..1e892e1 100644 --- a/sweet/cmd/sweet/integration_test.go +++ b/sweet/cmd/sweet/integration_test.go @@ -181,9 +181,7 @@ func testSweetEndToEnd(t *testing.T, pgo bool) { var wg sync.WaitGroup for i, shard := range []string{ "tile38", "go-build", "biogo-igor", "biogo-krishna", "bleve-query", - // TODO(go.dev/issue/51445): Enable once gVisor builds with Go 1.19. - // "gvisor", - "fogleman-pt", "bleve-index,fogleman-fauxgl,gopher-lua,markdown", + "gvisor", "fogleman-pt", "bleve-index,fogleman-fauxgl,gopher-lua,markdown", } { sema.Acquire(context.Background(), 1) wg.Add(1) diff --git a/sweet/harnesses/gvisor.go b/sweet/harnesses/gvisor.go index 85be166..a04c7fd 100644 --- a/sweet/harnesses/gvisor.go +++ b/sweet/harnesses/gvisor.go @@ -29,7 +29,7 @@ func (h GVisor) Get(srcDir string) error { srcDir, "https://github.com/google/gvisor", "go", - "adc7bb5e1baf4a7489e428e1fad756e5e2aa3410", // release-20220228.0-4233-gadc7bb5e1 + "8e6a0b996cdf2ef97d9caa01f6d0c1c27751c33a", // release-20221010.0-23-gc40f8e365 ) }