X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..ff87943aadb7d5e46b41b6ad329015f65b3c52d4:/tools/jenkins/Flags.sh

diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh
index 100cc16011..62d76e3a0d 100755
--- a/tools/jenkins/Flags.sh
+++ b/tools/jenkins/Flags.sh
@@ -2,6 +2,14 @@
 
 set -e
 
+if [ $# -lt 4 ]
+  then
+    echo "Needs 4 arguments : JAVA MC SMPI DEBUG"
+    exit -1
+fi
+
+
+
 die() {
     echo "$@"
     exit 1
@@ -42,25 +50,46 @@ NUMPROC="$(nproc)" || NUMPROC=1
 
 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 = "JAVA" ]
+then 
+  buildjava="ON"
+else
+  buildjava="OFF"
+fi
+
+if [ $2 = "MC" ]
+then 
+  buildmc="ON"
+else
+  buildmc="OFF"
+fi
+
+if [ $3 = "SMPI" ]
+then 
+  buildsmpi="ON"
+else
+  buildsmpi="OFF"
+fi
+
+if [ $4 = "DEBUG" ]
+then 
+  builddebug="ON"
+else
+  builddebug="OFF"
+fi
+
+
+echo "Step ${STEP}/${NSTEPS} - Building 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
+