try to fix MC now (sigh, CMake ...)

[simgrid.git] / tools / jenkins / Flags.sh

diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh
index 352db71..a76c411 100755 (executable)
--- a/tools/jenkins/Flags.sh
+++ b/tools/jenkins/Flags.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-echo "Starting Flags.sh $@" 
+echo "Starting Flags.sh $*"
 
 die() {
     echo "$@"
@@ -72,26 +72,26 @@ else
   builddebug="OFF"
 fi
 
-if [ $4 = "MSG" ]
+if [ $5 = "MSG" ]
 then
   buildmsg="ON"
 else
   buildmsg="OFF"
 fi
 
-if [ $buildmsg = "OFF" -a $buildjava = "ON" ] 
+if [ $buildmsg = "OFF" ] && [ $buildjava = "ON" ]
 then
   echo "Don't even try to build Java without MSG"
-  exit 1
+  exit 0
 fi
 
 echo "Step ${STEP}/${NSTEPS} - Building with java=${buildjava}, debug=${builddebug}, SMPI=${buildsmpi}, MC=${buildmc}, MSG=${buildmsg}"
-cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=${buildjava} -Denable_MSG=${buildmsg} \
+cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=${buildjava} -Denable_msg=${buildmsg} \
       -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
       -Denable_jedule=ON -Denable_mallocators=ON -Denable_debug=${builddebug} \
       -Denable_smpi=${buildsmpi} -Denable_smpi_MPICH3_testsuite=${buildsmpi} -Denable_model-checking=${buildmc} \
       -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=OFF \
-      -Denable_ns3=$(onoff test "$buildmc" != "ON") -Denable_coverage=OFF $WORKSPACE
+      -Denable_ns3=$(onoff test "$buildmc" != "ON") -Denable_coverage=OFF -DLTO_EXTRA_FLAG="auto" $WORKSPACE
 
 make -j$NUMPROC tests
 make clean