From: Johannes Schindelin <johannes.schindelin@xxxxxx>
Let's not decide in the generic ci/ part how many jobs to run in
parallel; different CI configurations would favor a different number of
parallel jobs, and it is easy enough to hand that information down via
the `MAKEFLAGS` variable.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
ci/lib.sh | 1 +
ci/run-build-and-tests.sh | 2 +-
ci/run-linux32-build.sh | 2 +-
ci/run-static-analysis.sh | 2 +-
ci/test-documentation.sh | 4 ++--
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ci/lib.sh b/ci/lib.sh
index 3f286d86a6..32a28fd209 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -101,6 +101,7 @@ then
BREW_INSTALL_PACKAGES="git-lfs gettext"
export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
export GIT_TEST_OPTS="--verbose-log -x --immediate"
+ export MAKEFLAGS="--jobs=2"
else
echo "Could not identify CI type" >&2
exit 1
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index db342bb6a8..80d72d120f 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -7,7 +7,7 @@
ln -s "$cache_dir/.prove" t/.prove
-make --jobs=2
+make
make --quiet test
if test "$jobname" = "linux-gcc"
then
diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh
index 2c60d2e70a..09e9276e12 100755
--- a/ci/run-linux32-build.sh
+++ b/ci/run-linux32-build.sh
@@ -55,6 +55,6 @@ linux32 --32bit i386 su -m -l $CI_USER -c '
set -ex
cd /usr/src/git
test -n "$cache_dir" && ln -s "$cache_dir/.prove" t/.prove
- make --jobs=2
+ make
make --quiet test
'
diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh
index dc189c7456..a19aa7ebbc 100755
--- a/ci/run-static-analysis.sh
+++ b/ci/run-static-analysis.sh
@@ -5,7 +5,7 @@
. ${0%/*}/lib.sh
-make --jobs=2 coccicheck
+make coccicheck
set +x
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
index 7d0beb2832..be3b7d376a 100755
--- a/ci/test-documentation.sh
+++ b/ci/test-documentation.sh
@@ -12,7 +12,7 @@ make check-builtins
make check-docs
# Build docs with AsciiDoc
-make --jobs=2 doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
+make doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
! test -s stderr.log
test -s Documentation/git.html
test -s Documentation/git.xml
@@ -24,7 +24,7 @@ check_unignored_build_artifacts
# Build docs with AsciiDoctor
make clean
-make --jobs=2 USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
+make USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
sed '/^GIT_VERSION = / d' stderr.log
! test -s stderr.log
test -s Documentation/git.html
--
gitgitgadget
