aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-07-24 14:17:33 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-07-24 14:22:19 +0200
commite005991be014444a7228cc000d7d940b6c810bc2 (patch)
tree053a7b477b6eecfb1aa77d2a294e97b59ed547ce /docker
parentfc73c2beb6eebcb03e5cd0b7f13599db129d0480 (diff)
Minor restructuring of code
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/ci/vespa-ci-internal.sh3
1 files changed, 1 insertions, 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}
}