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
Introduce the SimGrid Chaos Monkey
[simgrid.git]
/
tools
/
jenkins
/
build.sh
diff --git
a/tools/jenkins/build.sh
b/tools/jenkins/build.sh
index
7cffc16
..
e22568a
100755
(executable)
--- a/
tools/jenkins/build.sh
+++ b/
tools/jenkins/build.sh
@@
-156,6
+156,12
@@
if [ "$os" = "NixOS" ] ; then
fi
echo "XX have_NS3: ${have_NS3}"
fi
echo "XX have_NS3: ${have_NS3}"
+SIMGRID_PYTHON_LIBDIR=""
+if [ "$os" = "NixOS" ] ; then
+ SIMGRID_PYTHON_LIBDIR="/home/ci/simgrid_install/lib64"
+fi
+echo "XX SIMGRID_PYTHON_LIBDIR: ${SIMGRID_PYTHON_LIBDIR}"
+
# This is for Windows:
PATH="$WORKSPACE/build/lib:$PATH"
# This is for Windows:
PATH="$WORKSPACE/build/lib:$PATH"
@@
-208,12
+214,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_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} \
+ -DSIMGRID_PYTHON_LIBDIR=${SIMGRID_PYTHON_LIBDIR} \
+ ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} \
-Denable_java=$(onoff test "$build_mode" = "ModelChecker") \
-Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \
-DLTO_EXTRA_FLAG="auto" \
"$SRCFOLDER"
-Denable_java=$(onoff test "$build_mode" = "ModelChecker") \
-Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \
-DLTO_EXTRA_FLAG="auto" \
"$SRCFOLDER"
-# -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
set +x
make -j $NUMBER_OF_PROCESSORS VERBOSE=1 tests
set +x
make -j $NUMBER_OF_PROCESSORS VERBOSE=1 tests