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
Change how we lock things up ...
[simgrid.git]
/
tools
/
jenkins
/
build.sh
diff --git
a/tools/jenkins/build.sh
b/tools/jenkins/build.sh
index
9162841
..
e05907f
100755
(executable)
--- a/
tools/jenkins/build.sh
+++ b/
tools/jenkins/build.sh
@@
-125,6
+125,13
@@
case "$build_mode" in
;;
esac
;;
esac
+if [ "$2" = "" ]; then
+ branch_name="unknown"
+else
+ branch_name="$2"
+fi
+echo "Branch built is $branch_name"
+
NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
GENERATOR="Unix Makefiles"
NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
GENERATOR="Unix Makefiles"
@@
-182,6
+189,13
@@
else
MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
fi
MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
fi
+if [ "$os" = "NixOS" -a "$(gcc -dumpversion)" = "7.4.0" ]; then
+ echo "Temporary disable LTO, believed to be broken on this system."
+ MAY_DISABLE_LTO=-Denable_lto=OFF
+else
+ MAY_DISABLE_LTO=
+fi
+
cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
-Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
-Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
-Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
-Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
@@
-192,12
+206,12
@@
cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
-Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
-Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
-Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
-Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
-Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
-Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
- -Denable_jedule=OFF -Denable_java=ON -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} \
+ -Denable_jedule=OFF -Denable_java=ON -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE}
${MAY_DISABLE_LTO}
\
$SRCFOLDER
# -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
set +x
$SRCFOLDER
# -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
set +x
-make -j$NUMBER_OF_PROCESSORS VERBOSE=1
+make -j$NUMBER_OF_PROCESSORS VERBOSE=1
tests
echo "XX"
echo "XX Run the tests"
echo "XX"
echo "XX Run the tests"
@@
-210,7
+224,7
@@
if [ -f Testing/TAG ] ; then
mv CTestResults.xml $WORKSPACE
fi
mv CTestResults.xml $WORKSPACE
fi
-if test -n "$INSTALL" && [ ${
BRANCH_NAME} = "
master" ] ; then
+if test -n "$INSTALL" && [ ${
branch_name} = "origin/
master" ] ; then
echo "XX"
echo "XX Test done. Install everything since it's a regular build, not on a Windows."
echo "XX"
echo "XX"
echo "XX Test done. Install everything since it's a regular build, not on a Windows."
echo "XX"