From b978995f5db06cc1b8f5a46adc38e4a30102d061 Mon Sep 17 00:00:00 2001 From: Albert Strasheim Date: Thu, 13 Dec 2012 10:14:32 +0400 Subject: [PATCH] runtime/race: fix test for GOMAXPROCS>1 Fixes #4530. R=dvyukov, dave CC=golang-dev https://golang.org/cl/6933052 --- src/pkg/runtime/race/race_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pkg/runtime/race/race_test.go b/src/pkg/runtime/race/race_test.go index b97eb43870..fac06616fc 100644 --- a/src/pkg/runtime/race/race_test.go +++ b/src/pkg/runtime/race/race_test.go @@ -146,7 +146,13 @@ func runTests() ([]byte, error) { // The following flags turn off heuristics that suppress seemingly identical reports. // It is required because the tests contain a lot of data races on the same addresses // (the tests are simple and the memory is constantly reused). - cmd.Env = append(os.Environ(), `GORACE="suppress_equal_stacks=0 suppress_equal_addresses=0"`) + for _, env := range os.Environ() { + if strings.HasPrefix(env, "GOMAXPROCS=") { + continue + } + cmd.Env = append(cmd.Env, env) + } + cmd.Env = append(cmd.Env, `GORACE="suppress_equal_stacks=0 suppress_equal_addresses=0"`) ret, _ := cmd.CombinedOutput() return ret, nil }