Commit 01a5b66d authored by Dmitriy Vyukov's avatar Dmitriy Vyukov

runtime: deadlock tests now work with GOMAXPROCS>1

Fixes #4826.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/7434046
parent 46890f60
......@@ -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)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment