diff --git a/go/analysis/multichecker/multichecker_race_test.go b/go/analysis/multichecker/multichecker_race_test.go deleted file mode 100644 index 67dce868dd..0000000000 --- a/go/analysis/multichecker/multichecker_race_test.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//+build race - -// This file exists to allow us to detect that we're in race detector mode for temporarily -// disabling tests that are broken on tip with the race detector turned on. -// TODO(matloob): delete this once golang.org/issue/31749 is fixed. - -package multichecker_test - -func init() { - race = true -} diff --git a/go/analysis/multichecker/multichecker_test.go b/go/analysis/multichecker/multichecker_test.go index 9c13410fee..ca3dab5335 100644 --- a/go/analysis/multichecker/multichecker_test.go +++ b/go/analysis/multichecker/multichecker_test.go @@ -7,7 +7,6 @@ import ( "os" "os/exec" "runtime" - "strings" "testing" "golang.org/x/tools/go/analysis" @@ -30,15 +29,9 @@ func main() { multichecker.Main(findcall.Analyzer, fail) } -var race = false - // TestExitCode ensures that analysis failures are reported correctly. // This test fork/execs the main function above. func TestExitCode(t *testing.T) { - if v := runtime.Version(); strings.Contains(v, "devel") && race { - t.Skip("golang.org/issue/31749: This test is broken on tip in race mode. Skip until it's fixed.") - } - if runtime.GOOS != "linux" { t.Skipf("skipping fork/exec test on this platform") } diff --git a/go/loader/loader_race_test.go b/go/loader/loader_race_test.go deleted file mode 100644 index 710deec593..0000000000 --- a/go/loader/loader_race_test.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//+build race - -// This file exists to allow us to detect that we're in race detector mode for temporarily -// disabling tests that are broken on tip with the race detector turned on. -// TODO(matloob): delete this once golang.org/issue/31749 is fixed. - -package loader_test - -func init() { - race = true -} diff --git a/go/loader/loader_test.go b/go/loader/loader_test.go index 61292a06ba..5fa3254674 100644 --- a/go/loader/loader_test.go +++ b/go/loader/loader_test.go @@ -262,13 +262,7 @@ func TestLoad_FromSource_Success(t *testing.T) { } } -var race = false - func TestLoad_FromImports_Success(t *testing.T) { - if v := runtime.Version(); strings.Contains(v, "devel") && race { - t.Skip("golang.org/issue/31749: This test is broken on tip in race mode. Skip until it's fixed.") - } - if runtime.Compiler == "gccgo" { t.Skip("gccgo has no standard library test files") } diff --git a/go/packages/packages_race_test.go b/go/packages/packages_race_test.go deleted file mode 100644 index dd90d1cd55..0000000000 --- a/go/packages/packages_race_test.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//+build race - -// This file exists to allow us to detect that we're in race detector mode for temporarily -// disabling tests that are broken on tip with the race detector turned on. -// TODO(matloob): delete this once golang.org/issue/31749 is fixed. - -package packages_test - -func init() { - race = true -} diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go index 2c421e3cce..63818a5326 100644 --- a/go/packages/packages_test.go +++ b/go/packages/packages_test.go @@ -2342,14 +2342,8 @@ const A = 4 } } -var race = false - func TestIssue32814(t *testing.T) { packagestest.TestAll(t, testIssue32814) } func testIssue32814(t *testing.T, exporter packagestest.Exporter) { - if v := runtime.Version(); strings.Contains(v, "devel") && race { - t.Skip("golang.org/issue/31749: This test is broken on tip in race mode. Skip until it's fixed.") - } - exported := packagestest.Export(t, exporter, []packagestest.Module{{ Name: "golang.org/fake", Files: map[string]interface{}{}}}) diff --git a/go/packages/stdlib_test.go b/go/packages/stdlib_test.go index 2ab00daa42..93d02d2e5b 100644 --- a/go/packages/stdlib_test.go +++ b/go/packages/stdlib_test.go @@ -19,10 +19,6 @@ import ( // This test loads the metadata for the standard library, func TestStdlibMetadata(t *testing.T) { - if v := runtime.Version(); strings.Contains(v, "devel") && race { - t.Skip("golang.org/issue/31749: This test is broken on tip in race mode. Skip until it's fixed.") - } - // TODO(adonovan): see if we can get away without this hack. // if runtime.GOOS == "android" { // t.Skipf("incomplete std lib on %s", runtime.GOOS)