Revert "sweet: disable gvisor benchmark"
This reverts CL 389754. Following CL 390954, our gVisor build is
compatible with Go 1.19.
Fixes golang/go#51445.
Change-Id: Ideee154c48b24cd28af213833aeacdeb60fc4408
Reviewed-on: https://go-review.googlesource.com/c/benchmarks/+/390955
Trust: Michael Pratt <mpratt@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
diff --git a/sweet/cmd/sweet/benchmark.go b/sweet/cmd/sweet/benchmark.go
index e6f7d18..e650947 100644
--- a/sweet/cmd/sweet/benchmark.go
+++ b/sweet/cmd/sweet/benchmark.go
@@ -108,18 +108,12 @@
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"],
},
"all": func() (b []*benchmark) {
for i := range allBenchmarks {
- if allBenchmarks[i].name == "gvisor" {
- // TODO(go.dev/issue/51445): Include in "all"
- // once gVisor builds with Go 1.19.
- continue
- }
b = append(b, &allBenchmarks[i])
}
return
diff --git a/sweet/cmd/sweet/integration_test.go b/sweet/cmd/sweet/integration_test.go
index c106f4c..1af2785 100644
--- a/sweet/cmd/sweet/integration_test.go
+++ b/sweet/cmd/sweet/integration_test.go
@@ -156,9 +156,7 @@
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)
