tests: Dynamically determine make parallelism

martinpitt · Nov 15, 2020 · 7644779 · 7644779
1 parent 97dbd2e
commit 7644779
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/tests/run-alpine b/tests/run-alpine
@@ -18,6 +18,7 @@ apk add --no-cache autoconf automake libtool gcc musl-dev glib-dev eudev-dev lib
 # run build as user
 su -s /bin/sh - guest << EOG
 set -ex
+export MAKEFLAGS="-j$(nproc)"
 cp -r /source /tmp
 cd /tmp/source
 ./autogen.sh

diff --git a/tests/run-centos b/tests/run-centos
@@ -19,10 +19,11 @@ dnf -y --enablerepo=PowerTools install autoconf automake gcc glib2-devel gtk-doc
 useradd guest
 su -s /bin/sh - guest << EOG
 set -ex
+export MAKEFLAGS="-j$(nproc)"
 cp -r /source /tmp
 cd /tmp/source
 ./autogen.sh
-make -j4
+make
 make check
 EOG
 

diff --git a/tests/run-fedora b/tests/run-fedora
@@ -21,10 +21,11 @@ dnf -y install autoconf automake gcc glib2-devel gtk-doc libgudev1-devel libtool
 useradd guest
 su -s /bin/sh - guest << EOG
 set -eux
+export MAKEFLAGS="-j$(nproc)"
 cp -r /source /tmp
 cd /tmp/source
 ./autogen.sh
-make -j4
+make
 make check
 make check-valgrind
 EOG

diff --git a/tests/run-ubuntu b/tests/run-ubuntu
@@ -29,12 +29,14 @@ eatmydata apt-get install -y --no-install-recommends pkg-config dh-autoreconf au
 useradd build
 su -s /bin/sh - build << EOG
 set -ex
+export MAKEFLAGS="-j$(nproc)"
 cp -r /source /tmp
 cd /tmp/source
 ./autogen.sh --prefix=/usr
-make -j$(nproc)
+make
+make check
 make check-valgrind
-make -j$(nproc) distcheck
+make distcheck
 EOG
 
 # install and run check-installed
@@ -48,7 +50,7 @@ set -ex
 cd /tmp/source
 make distclean
 ./autogen.sh --prefix=/usr CPPFLAGS=-DNDEBUG
-make -j$(nproc) check
+make check
 EOG
 
 # copy release tarball to outside