change parallelization in code

pull/11803/head
Sharif Elgamal 2021-06-29 11:46:38 -07:00
parent 065929ffd0
commit 73e42a9a8c
3 changed files with 7 additions and 2 deletions

View File

@ -30,7 +30,7 @@ ARCH="amd64"
OS="darwin"
DRIVER="docker"
JOB_NAME="Docker_macOS"
EXTRA_TEST_ARGS="-test.parallel=2"
EXTRA_TEST_ARGS=""
EXPECTED_DEFAULT_DRIVER="docker"
EXTERNAL="yes"

View File

@ -30,7 +30,7 @@ ARCH="amd64"
OS="darwin"
DRIVER="hyperkit"
JOB_NAME="Hyperkit_macOS"
EXTRA_TEST_ARGS="-test.parallel=2"
EXTRA_TEST_ARGS=""
EXPECTED_DEFAULT_DRIVER="hyperkit"
EXTERNAL="yes"

View File

@ -97,6 +97,11 @@ func setMaxParallelism() {
// Each "minikube start" consumes up to 2 cores, though the average usage is somewhat lower
limit := int(math.Floor(float64(maxp) / 1.75))
// cut the number of parallel tests in half for macOS
if runtime.GOOS == "darwin" && limit > 2 {
limit /= 2
}
fmt.Fprintf(os.Stderr, "Found %d cores, limiting parallelism with --test.parallel=%d\n", maxp, limit)
if err := flag.Set("test.parallel", strconv.Itoa(limit)); err != nil {
fmt.Fprintf(os.Stderr, "Unable to set test.parallel: %v\n", err)