more info to the user.

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

diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh
index 931a135..100cc16 100755 (executable)
--- a/tools/jenkins/Flags.sh
+++ b/tools/jenkins/Flags.sh
@@ -17,6 +17,15 @@ do_cleanup() {
   done
 }
 
   done
 }
 

+# Get an ON/OFF string from a command:
+onoff() {
+  if "$@" > /dev/null ; then
+    echo ON
+  else
+    echo OFF
+  fi
+}
+

 ### Cleanup previous runs
 
 ! [ -z "$WORKSPACE" ] || die "No WORKSPACE"
 ### Cleanup previous runs
 
 ! [ -z "$WORKSPACE" ] || die "No WORKSPACE"


@@ -35,18 +44,19 @@ cd $WORKSPACE/build
 
 for buildjava in ON OFF
 do
 
 for buildjava in ON OFF
 do

-  for buildmalloc in ON OFF
+  for builddebug in ON OFF

   do
     for buildsmpi in ON OFF
     do
       for buildmc in ON OFF
       do
   do
     for buildsmpi in ON OFF
     do
       for buildmc in ON OFF
       do

-        echo "build with java=${buildjava}, mallocators=${buildmalloc}, SMPI=${buildsmpi}, MC=${buildmc}"
+        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 \
         cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=${buildjava} \
               -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \

-              -Denable_jedule=ON -Denable_mallocators=${buildmalloc} \
+              -Denable_jedule=ON -Denable_mallocators=ON -Denable_debug=${builddebug} \

               -Denable_smpi=${buildsmpi} -Denable_smpi_MPICH3_testsuite=${buildsmpi} -Denable_model-checking=${buildmc} \
               -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_coverage=OFF $WORKSPACE
+              -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
         make -j$NUMPROC
         make clean
       done