From e005991be014444a7228cc000d7d940b6c810bc2 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 24 Jul 2017 14:17:33 +0200 Subject: Minor restructuring of code --- docker/ci/vespa-ci-internal.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/ci/vespa-ci-internal.sh b/docker/ci/vespa-ci-internal.sh index ba34d5a2ccc..118bfea7473 100755 --- a/docker/ci/vespa-ci-internal.sh +++ b/docker/ci/vespa-ci-internal.sh @@ -15,8 +15,6 @@ MAPPED_DIR=/vespa SOURCE_DIR=~/vespa BUILD_DIR=~/build LOG_DIR=~/log -NUM_CORES=$(nproc --all) -NUM_THREADS=$((${NUM_CORES} * 2)) function build_java { cd "${SOURCE_DIR}" @@ -34,6 +32,7 @@ function build_cpp { -DCMAKE_BUILD_RPATH=/opt/vespa/lib64 \ -DVALGRIND_UNIT_TESTS=no \ "${SOURCE_DIR}" + NUM_THREADS=$(($(nproc --all) * 2)) make -j ${NUM_THREADS} ctest3 -j ${NUM_THREADS} } -- cgit v1.2.3