From: John Coyle <dx9err@gmail.com>
Date: Wed, 21 Dec 2016 01:14:16 +0000 (-0500)
Subject: run-make-check.sh:  Init defaults after deps are installed.
X-Git-Tag: v12.0.3~289^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d0c778b54a30729ad11bd51281da28db59c7ae6;p=ceph.git

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 <dx9err@gmail.com>
---

diff --git a/run-make-check.sh b/run-make-check.sh
index ed77d672f19..1c43b669e08 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