summaryrefslogtreecommitdiff
path: root/tests/run-all
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-21 01:10:38 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-21 01:32:31 +0100
commitc0df25cd65b0172d5130e01a73aa610c3b0dd105 (patch)
tree685db94084e0b99716fe6aee1ee4f208357c33cb /tests/run-all
parent1967603885cd0fe76230fdfa9c026238da6c12a9 (diff)
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 <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/run-all')
-rwxr-xr-xtests/run-all5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/run-all b/tests/run-all
index cfa5ce2..f72b9fa 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="$*"