qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-06 15:36:24 -07:00
Code Releases Activity

runtime: fix FreeBSDNumCPU test

Browse Source 
num cpu unit test fixes for FreeBSD.
cpuset -g can possibly output more
data than expected.

Fixes #25924
This commit is contained in:
David Carlier 2018-06-16 12:40:04 +01:00
parent cdffe9b1e3
commit 4cc275b519
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/runtime/testdata/testprog/numcpu_freebsd.go vendored
View File

@ -9,12 +9,17 @@ import (
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"regexp"
"runtime" "runtime"
"strconv" "strconv"
"strings" "strings"
"syscall" "syscall"
) )
var (
cpuSetRE = regexp.MustCompile(`(\d,?)+`)
)
func init() { func init() {
register("FreeBSDNumCPU", FreeBSDNumCPU) register("FreeBSDNumCPU", FreeBSDNumCPU)
register("FreeBSDNumCPUHelper", FreeBSDNumCPUHelper) register("FreeBSDNumCPUHelper", FreeBSDNumCPUHelper)
@ -105,8 +110,12 @@ func checkNCPU(list []string) error {
return fmt.Errorf("could not check against an empty CPU list") return fmt.Errorf("could not check against an empty CPU list")
} }
cListString := cpuSetRE.FindString(listString)
if len(cListString) == 0 {
return fmt.Errorf("invalid cpuset output '%s'", listString)
}
// Launch FreeBSDNumCPUHelper() with specified CPUs list. // Launch FreeBSDNumCPUHelper() with specified CPUs list.
cmd := exec.Command("cpuset", "-l", listString, os.Args[0], "FreeBSDNumCPUHelper") cmd := exec.Command("cpuset", "-l", cListString, os.Args[0], "FreeBSDNumCPUHelper")
cmdline := strings.Join(cmd.Args, " ") cmdline := strings.Join(cmd.Args, " ")
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
if err != nil { if err != nil {
@ -120,7 +129,7 @@ func checkNCPU(list []string) error {
return fmt.Errorf("fail to parse output from child '%s', error: %s, output: %s", cmdline, err, output) return fmt.Errorf("fail to parse output from child '%s', error: %s, output: %s", cmdline, err, output)
} }
if n != len(list) { if n != len(list) {
return fmt.Errorf("runtime.NumCPU() expected to %d, got %d when run with CPU list %s", len(list), n, listString) return fmt.Errorf("runtime.NumCPU() expected to %d, got %d when run with CPU list %s", len(list), n, cListString)
} }
return nil return nil
} }