From 3d0c778b54a30729ad11bd51281da28db59c7ae6 Mon Sep 17 00:00:00 2001 From: John Coyle Date: Tue, 20 Dec 2016 20:14:16 -0500 Subject: [PATCH] run-make-check.sh: Init defaults after deps are installed. get_processors() depends on coreutils nproc. Alpine does not install coreutils by default. Signed-off-by: John Coyle --- run-make-check.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/run-make-check.sh b/run-make-check.sh index ed77d672f1998..1c43b669e08cb 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -27,10 +27,6 @@ function get_processors() { fi } -DEFAULT_MAKEOPTS=${DEFAULT_MAKEOPTS:--j$(get_processors)} -BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS} -CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS} - function run() { local install_cmd if test -f /etc/redhat-release ; then @@ -53,6 +49,12 @@ function run() { if test -f ./install-deps.sh ; then $DRY_RUN ./install-deps.sh || return 1 fi + + # Init defaults after deps are installed. get_processors() depends on coreutils nproc. + DEFAULT_MAKEOPTS=${DEFAULT_MAKEOPTS:--j$(get_processors)} + BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS} + CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS} + $DRY_RUN ./do_cmake.sh $@ || return 1 $DRY_RUN cd build $DRY_RUN make $BUILD_MAKEOPTS tests || return 1 -- 2.39.5