From: Dmitriy Vyukov <dvyukov@google.com>
Date: Sat, 2 Mar 2013 06:41:53 +0000 (+0400)
Subject: runtime: deadlock tests now work with GOMAXPROCS>1
X-Git-Tag: go1.1rc2~723
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=01a5b66d95203f64b215de342487a8d522a3532b;p=gostls13.git

runtime: deadlock tests now work with GOMAXPROCS>1
Fixes #4826.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/7434046
---

diff --git a/src/pkg/runtime/crash_test.go b/src/pkg/runtime/crash_test.go
index b2db1d7b95..5f84cb5a2f 100644
--- a/src/pkg/runtime/crash_test.go
+++ b/src/pkg/runtime/crash_test.go
@@ -37,15 +37,7 @@ func executeTest(t *testing.T, templ string, data interface{}) string {
 	}
 	f.Close()
 
-	// Deadlock tests hang with GOMAXPROCS>1.  Issue 4826.
-	cmd := exec.Command("go", "run", src)
-	for _, s := range os.Environ() {
-		if strings.HasPrefix(s, "GOMAXPROCS") {
-			continue
-		}
-		cmd.Env = append(cmd.Env, s)
-	}
-	got, _ := cmd.CombinedOutput()
+	got, _ := exec.Command("go", "run", src).CombinedOutput()
 	return string(got)
 }