diff options
| -rw-r--r-- | .github/workflows/mingw.yml | 6 | ||||
| -rw-r--r-- | defs/gmake.mk | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index c109790013..2a01215f1c 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -75,7 +75,7 @@ jobs: - name: download unicode, gems, etc working-directory: build run: | - $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 + $jobs = [int]$env:NUMBER_OF_PROCESSORS * 2 make -j $jobs update-unicode make -j $jobs update-gems @@ -83,7 +83,7 @@ jobs: timeout-minutes: 40 working-directory: build run: | - $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 + $jobs = [int]$env:NUMBER_OF_PROCESSORS * 2 make -j $jobs - name: make install @@ -109,7 +109,7 @@ jobs: $PSDefaultParameterValues['*:Encoding'] = 'utf8' [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") - $jobs = [int]$env:NUMBER_OF_PROCESSORS + $jobs = [int]$env:NUMBER_OF_PROCESSORS * 2 make test-all TESTOPTS="-j $jobs --retry --job-status=normal --show-skip --timeout-scale=1.5" - name: test-spec diff --git a/defs/gmake.mk b/defs/gmake.mk index a4347ff318..7de43ced1c 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -4,6 +4,7 @@ reconfig config.status: export MAKE:=$(MAKE) override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+) override mflags := $(filter-out -j%,$(MFLAGS)) MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j) +nproc = $(subst -j,,$(filter -j%,$(MFLAGS))) CHECK_TARGETS := great exam love check test check% test% btest% # expand test targets, and those dependents @@ -90,6 +91,8 @@ sudo-precheck: test yes-test-testframework no-test-testframework install-prereq: sudo-precheck yes-test-all no-test-all: install endif +yes-test-bundler-parallel: PARALLELRSPECOPTS += $(if $(nproc),-n$(shell expr $(nproc) + $(nproc) / 2)) + # Cross reference needs to parse all files at once love install reinstall: RDOCFLAGS = --force-update |