From c0df25cd65b0172d5130e01a73aa610c3b0dd105 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 21 Jun 2018 01:10:38 +0100 Subject: [PATCH] test suite: Use nproc(1) rather than Sys::CPU. This is more portable and does not depend on libsys-cpu-perl being installed. Closes:888496. Signed-off-by: Ian Jackson --- debian/changelog | 4 ++++ tests/run-all | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2c305561..b34b4a0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ dgit (5.2~) unstable; urgency=medium explanation, rather than looping with a false coplaint about git fetch. Closes:#871317. + test suite: + * Use nproc(1) rather than Sys::CPU. This is more portable and does not + depend on libsys-cpu-perl being installed. Closes:888496. + -- dgit (5.1) unstable; urgency=medium diff --git a/tests/run-all b/tests/run-all index cfa5ce2f..f72b9fae 100755 --- a/tests/run-all +++ b/tests/run-all @@ -5,9 +5,8 @@ set -e set -o pipefail -set +e -jcpus=`perl -MSys::CPU -we 'printf "-j%d\n", 1.34 * Sys::CPU::cpu_count()'` -set -e +ncpus=$(nproc || echo 1) +jcpus=-j$(( ncpus * 134 / 100 )) if [ $# != 0 ]; then set TESTSCRIPTS="$*" -- 2.30.2