Add a cmake option to disable McMini tests, and rename some existing ones

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

diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh
index ea84301..dab4330 100755 (executable)
--- a/tools/jenkins/Flags.sh
+++ b/tools/jenkins/Flags.sh
@@ -77,10 +77,10 @@ else
 fi
 
 cmake -Denable_documentation=OFF \
-      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
+      -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"
@@ -89,7 +89,7 @@ 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'
+    ctest -j$NUMPROC -E '^[ps]thread-|mc-bugged1-liveness' --output-on-failure
 fi
 
 cd ..