aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2020-01-27 07:59:46 +0100
committerTom Rini <trini@konsulko.com>2020-01-30 13:30:35 -0500
commit84f0415201e57e1919a2c91684e64bdedd85d159 (patch)
treea7965da1bac5321009bfe9e4919e5555c433c134 /test
parent0f97e923d4921a057e1a7bbfac170cadefde5624 (diff)
downloadu-boot-84f0415201e57e1919a2c91684e64bdedd85d159.zip
u-boot-84f0415201e57e1919a2c91684e64bdedd85d159.tar.gz
u-boot-84f0415201e57e1919a2c91684e64bdedd85d159.tar.bz2
Consistently use nproc for counting the CPUs
Coreutils command nproc can be used on Linux and BSD to count the number of available CPU cores. Use this instead of relying on the parsing of the Linux specific proc file system. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Diffstat (limited to 'test')
-rw-r--r--test/common.sh2
-rwxr-xr-xtest/fs/fs-test.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/common.sh b/test/common.sh
index 702d1ed..904d579 100644
--- a/test/common.sh
+++ b/test/common.sh
@@ -13,7 +13,7 @@ fail() {
build_uboot() {
echo "Build sandbox"
OPTS="O=${OUTPUT_DIR} $1"
- NUM_CPUS=$(grep -c processor /proc/cpuinfo)
+ NUM_CPUS=$(nproc)
echo ${OPTS}
make ${OPTS} sandbox_config
make ${OPTS} -s -j${NUM_CPUS}
diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh
index 721af71..b877481 100755
--- a/test/fs/fs-test.sh
+++ b/test/fs/fs-test.sh
@@ -87,7 +87,7 @@ function check_clean() {
# Generate sandbox U-Boot - gleaned from /test/dm/test-dm.sh
function compile_sandbox() {
unset CROSS_COMPILE
- NUM_CPUS=$(cat /proc/cpuinfo |grep -c processor)
+ NUM_CPUS=$(nproc)
make O=sandbox sandbox_config
make O=sandbox -s -j${NUM_CPUS}