mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
testing: parallelize tests over count
Currently all package tests are executed once with Parallel tests executed in parallel. Then this process is repeated count*cpu times. Tests are not parallelized over count*cpu. Parallelizing over cpu is not possible as GOMAXPROCS is a global setting. But it is possible for count. Parallelize over count. Brings down testing of my package with -count=100 form 10s to 0.3s. Change-Id: I76d8322adeb8c5c6e70b99af690291fd69d6402a Reviewed-on: https://go-review.googlesource.com/44830 Run-TryBot: Dmitry Vyukov <dvyukov@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
parent
f7aa454c58
commit
f04d583618
2 changed files with 63 additions and 63 deletions
|
|
@ -991,27 +991,29 @@ func runTests(matchString func(pat, str string) (bool, error), tests []InternalT
|
|||
ok = true
|
||||
for _, procs := range cpuList {
|
||||
runtime.GOMAXPROCS(procs)
|
||||
ctx := newTestContext(*parallel, newMatcher(matchString, *match, "-test.run"))
|
||||
t := &T{
|
||||
common: common{
|
||||
signal: make(chan bool),
|
||||
barrier: make(chan bool),
|
||||
w: os.Stdout,
|
||||
chatty: *chatty,
|
||||
},
|
||||
context: ctx,
|
||||
}
|
||||
tRunner(t, func(t *T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.Name, test.F)
|
||||
for i := uint(0); i < *count; i++ {
|
||||
ctx := newTestContext(*parallel, newMatcher(matchString, *match, "-test.run"))
|
||||
t := &T{
|
||||
common: common{
|
||||
signal: make(chan bool),
|
||||
barrier: make(chan bool),
|
||||
w: os.Stdout,
|
||||
chatty: *chatty,
|
||||
},
|
||||
context: ctx,
|
||||
}
|
||||
// Run catching the signal rather than the tRunner as a separate
|
||||
// goroutine to avoid adding a goroutine during the sequential
|
||||
// phase as this pollutes the stacktrace output when aborting.
|
||||
go func() { <-t.signal }()
|
||||
})
|
||||
ok = ok && !t.Failed()
|
||||
ran = ran || t.ran
|
||||
tRunner(t, func(t *T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.Name, test.F)
|
||||
}
|
||||
// Run catching the signal rather than the tRunner as a separate
|
||||
// goroutine to avoid adding a goroutine during the sequential
|
||||
// phase as this pollutes the stacktrace output when aborting.
|
||||
go func() { <-t.signal }()
|
||||
})
|
||||
ok = ok && !t.Failed()
|
||||
ran = ran || t.ran
|
||||
}
|
||||
}
|
||||
return ran, ok
|
||||
}
|
||||
|
|
@ -1167,13 +1169,9 @@ func parseCpuList() {
|
|||
fmt.Fprintf(os.Stderr, "testing: invalid value %q for -test.cpu\n", val)
|
||||
os.Exit(1)
|
||||
}
|
||||
for i := uint(0); i < *count; i++ {
|
||||
cpuList = append(cpuList, cpu)
|
||||
}
|
||||
cpuList = append(cpuList, cpu)
|
||||
}
|
||||
if cpuList == nil {
|
||||
for i := uint(0); i < *count; i++ {
|
||||
cpuList = append(cpuList, runtime.GOMAXPROCS(-1))
|
||||
}
|
||||
cpuList = append(cpuList, runtime.GOMAXPROCS(-1))
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue