A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ninja verbose build is not like the Makefile ones
[simgrid.git]
/
tools
/
jenkins
/
build.sh
diff --git
a/tools/jenkins/build.sh
b/tools/jenkins/build.sh
index
3f15e2e
..
050c850
100755
(executable)
--- a/
tools/jenkins/build.sh
+++ b/
tools/jenkins/build.sh
@@
-130,9
+130,11
@@
echo "Branch built is $branch_name"
NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
GENERATOR="Unix Makefiles"
BUILDER=make
NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
GENERATOR="Unix Makefiles"
BUILDER=make
+VERBOSE_BUILD="VERBOSE=1"
if which ninja 2>/dev/null >/dev/null ; then
GENERATOR=Ninja
BUILDER=ninja
if which ninja 2>/dev/null >/dev/null ; then
GENERATOR=Ninja
BUILDER=ninja
+ VERBOSE_BUILD="-v"
fi
ulimit -c 0 || true
fi
ulimit -c 0 || true
@@
-222,7
+224,7
@@
cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
"$SRCFOLDER"
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
"$SRCFOLDER"
-${BUILDER} -j $NUMBER_OF_PROCESSORS
VERBOSE=1
tests
+${BUILDER} -j $NUMBER_OF_PROCESSORS
${VERBOSE_BUILD}
tests
echo "XX"
echo "XX Run the tests"
echo "XX"
echo "XX Run the tests"