X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6fbcdfade89b3812c24152c86f8aa3be510df7f2..b58b0ba2f6b92efa234677e19dd998346113504d:/tools/jenkins/Flags.sh?ds=sidebyside

diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh
index 9d3af90410..dab4330d42 100755
--- a/tools/jenkins/Flags.sh
+++ b/tools/jenkins/Flags.sh
@@ -18,7 +18,7 @@ onoff() {
   fi
 }
 
-[ $# -eq 4 ] || die "Needs 4 arguments : MC SMPI DEBUG MSG"
+[ $# -eq 3 ] || die "Needs 3 arguments : MC SMPI DEBUG"
 
 ### Cleanup previous runs
 
@@ -65,23 +65,32 @@ else
   builddebug="OFF"
 fi
 
-if [ "$4" = "MSG" ]
-then
-  buildmsg="ON"
+echo "Step ${STEP}/${NSTEPS} - Building with debug=${builddebug}, SMPI=${buildsmpi}, MC=${buildmc}"
+
+if [ "${builddebug}/${buildsmpi}/${buildmc}" = "ON/ON/ON" ]; then
+    # ${buildmc}=ON because "why not", and especially because it doesn't
+    # compile with -D_GLIBCXX_DEBUG and -Denable_ns3=ON together
+    export CXXFLAGS=-D_GLIBCXX_DEBUG
+    runtests="ON"
 else
-  buildmsg="OFF"
+    runtests="OFF"
 fi
 
-echo "Step ${STEP}/${NSTEPS} - Building with debug=${builddebug}, SMPI=${buildsmpi}, MC=${buildmc}, MSG=${buildmsg}"
-cmake -Denable_documentation=OFF -Denable_msg=${buildmsg} \
-      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
+cmake -Denable_documentation=OFF \
+      -Denable_compile_optimizations=${runtests} -Denable_compile_warnings=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_MBI_testsuite=OFF \
+      -Denable_smpi=${buildsmpi} -Denable_testsuite_smpi_MPICH3=${buildsmpi} -Denable_model-checking=${buildmc} \
+      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_testsuite_smpi_MBI=OFF -Denable_testsuite_McMini=OFF \
       -Denable_ns3=$(onoff test "$buildmc" != "ON") -DNS3_HINT=/builds/ns-3-dev/build/ \
       -Denable_coverage=OFF -DLTO_EXTRA_FLAG="auto" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
       "$WORKSPACE"
 
 make -j$NUMPROC tests
+
+if [ "$runtests" = "ON" ]; then
+    # exclude tests known to fail with _GLIBCXX_DEBUG
+    ctest -j$NUMPROC -E '^[ps]thread-|mc-bugged1-liveness' --output-on-failure
+fi
+
 cd ..
 rm -rf build