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 <[email protected]>
chriszl · Dec 21, 2016 · 3d0c778 · 3d0c778
1 parent 12706d7
commit 3d0c778
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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