X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f59cb100dd632a729c4729360ddf1f46da52bec..6051369d9427154f912e8affc417f20a26a0eb95:/tools/jenkins/Flags.sh

diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh
index 100cc16011..1fe6b380c3 100755
--- a/tools/jenkins/Flags.sh
+++ b/tools/jenkins/Flags.sh
@@ -1,22 +1,14 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 set -e
 
+echo "Starting Flags.sh $*"
+
 die() {
     echo "$@"
     exit 1
 }
 
-do_cleanup() {
-  for d in "$WORKSPACE/build"
-  do
-    if [ -d "$d" ]
-    then
-      rm -rf "$d" || die "Could not remote $d"
-    fi
-  done
-}
-
 # Get an ON/OFF string from a command:
 onoff() {
   if "$@" > /dev/null ; then
@@ -26,41 +18,88 @@ onoff() {
   fi
 }
 
-### Cleanup previous runs
+[ $# -eq 3 ] || die "Needs 3 arguments : MC SMPI DEBUG"
 
-! [ -z "$WORKSPACE" ] || die "No WORKSPACE"
+### Cleanup previous runs
+
+[ -n "$WORKSPACE" ] || die "No WORKSPACE"
 [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist"
 
-do_cleanup
+do_cleanup() {
+  for d
+  do
+    if [ -d "$d" ]
+    then
+      rm -rf "$d" || die "Could not remove $d"
+    fi
+    mkdir "$d" || die "Could not create $d"
+  done
+}
 
-for d in "$WORKSPACE/build"
-do
-  mkdir "$d" || die "Could not create $d"
-done
+do_cleanup "$WORKSPACE/build"
 
 NUMPROC="$(nproc)" || NUMPROC=1
 
-cd $WORKSPACE/build
+cd "$WORKSPACE"/build
 
-for buildjava in ON OFF
-do
-  for builddebug in ON OFF
-  do
-    for buildsmpi in ON OFF
-    do
-      for buildmc in ON OFF
-      do
-        echo "build with java=${buildjava}, debug=${builddebug}, SMPI=${buildsmpi}, MC=${buildmc}"
-        cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=${buildjava} \
-              -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
-        make -j$NUMPROC
-        make clean
-      done
-    done
-  done
-done 
+#we can't just receive ON or OFF as values as display is bad in the resulting jenkins matrix
+
+if [ "$1" = "MC" ]
+then
+  buildmc="ON"
+else
+  buildmc="OFF"
+fi
+
+if [ "$2" = "SMPI" ]
+then
+  buildsmpi="ON"
+else
+  buildsmpi="OFF"
+fi
+
+if [ "$3" = "DEBUG" ]
+then
+  builddebug="ON"
+else
+  builddebug="OFF"
+fi
+
+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
+    runtests="OFF"
+fi
+
+GENERATOR="Unix Makefiles"
+BUILDER=make
+VERBOSE_BUILD="VERBOSE=1"
+if which ninja 2>/dev/null >/dev/null ; then
+  GENERATOR=Ninja
+  BUILDER=ninja
+  VERBOSE_BUILD="-v"
+fi
+
+cmake -G"$GENERATOR" -Denable_documentation=OFF \
+      -Denable_compile_optimizations=${runtests} -Denable_compile_warnings=ON \
+      -Denable_mallocators=ON -Denable_debug=${builddebug} \
+      -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"
+
+${BUILDER} -j$NUMPROC tests ${VERBOSE_BUILD}
+
+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