mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
runtime: deadlock tests now work with GOMAXPROCS>1
Fixes #4826. R=golang-dev, r CC=golang-dev https://golang.org/cl/7434046
This commit is contained in:
parent
46890f60ce
commit
01a5b66d95
1 changed files with 1 additions and 9 deletions
|
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue