Add more infos to Flags output, and write them to a file.

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

diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh
index b5acd37..57b4f27 100755 (executable)
--- a/tools/jenkins/Flags.sh
+++ b/tools/jenkins/Flags.sh
@@ -17,6 +17,15 @@ do_cleanup() {
   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"
@@ -33,6 +42,9 @@ NUMPROC="$(nproc)" || NUMPROC=1
 
 cd $WORKSPACE/build
 
+NSTEPS=16
+STEP=1
+
 for buildjava in ON OFF
 do
   for builddebug in ON OFF
@@ -41,16 +53,21 @@ do
     do
       for buildmc in ON OFF
       do
-        echo "build with java=${buildjava}, debug=${builddebug}, SMPI=${buildsmpi}, MC=${buildmc}"
+        echo "Step ${STEP}/${NSTEPS} - Building with java=${buildjava}, debug=${builddebug}, SMPI=${buildsmpi}, MC=${buildmc}"
+        echo "Step ${STEP}/${NSTEPS} - Building with java=${buildjava}, debug=${builddebug}, SMPI=${buildsmpi}, MC=${buildmc}" > $WORKSPACE/buildstep
         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_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
+        STEP=$((${STEP}+1))
       done
     done
   done
 done 
 
+echo "All builds finished cleanly" > $WORKSPACE/buildstep
+