From: Albert Strasheim <fullung@gmail.com>
Date: Thu, 13 Dec 2012 06:14:32 +0000 (+0400)
Subject: runtime/race: fix test for GOMAXPROCS>1
X-Git-Tag: go1.1rc2~1640
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b978995f5db06cc1b8f5a46adc38e4a30102d061;p=gostls13.git

runtime/race: fix test for GOMAXPROCS>1

Fixes #4530.

R=dvyukov, dave
CC=golang-dev
https://golang.org/cl/6933052
---

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
 }