[jenkins] ask for verbose compilations, to see what's going on on windows

[simgrid.git] / buildtools / jenkins / build.sh

diff --git a/buildtools/jenkins/build.sh b/buildtools/jenkins/build.sh
index 2341297..8e9720a 100755 (executable)
--- a/buildtools/jenkins/build.sh
+++ b/buildtools/jenkins/build.sh
@@ -2,10 +2,6 @@
 
 set -e
 
-build_mode="$1"
-
-echo "Build mode $build_mode on $(uname -np)" >&2
-
 # usage: die status message...
 die () {
   local status=${1:-1}
@@ -24,20 +20,8 @@ onoff() {
   fi
 }
 
-ulimit -c 0
-
-if [ -d $WORKSPACE/build ]
-then
-  rm -rf $WORKSPACE/build
-fi
-mkdir $WORKSPACE/build
-cd $WORKSPACE/build
-
-cmake -Denable_documentation=OFF $WORKSPACE
-make dist VERBOSE=1
-tar xzf `cat VERSION`.tar.gz
-cd `cat VERSION`
-
+build_mode="$1"
+echo "Build mode $build_mode on $(uname -np)" >&2
 case "$build_mode" in
   "Debug")
   ;;
@@ -49,13 +33,38 @@ case "$build_mode" in
   ;;
 
   *)
-  die 1 "Unknown build_mode $build_mode"
+    die 1 "Unknown build_mode $build_mode"
   ;;
 esac
 
-cmake -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
+if test "$(uname -o)" = "Msys"; then
+  if [ -z "$NUMBER_OF_PROCESSORS" ]; then
+    NUMBER_OF_PROCESSORS=1
+  fi
+  GENERATOR="MSYS Makefiles"
+else
+  NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
+  GENERATOR="Unix Makefiles"
+fi
+
+ulimit -c 0 || true
+
+if [ -d $WORKSPACE/build ]
+then
+  rm -rf $WORKSPACE/build
+fi
+mkdir $WORKSPACE/build
+cd $WORKSPACE/build
+
+cmake -G"$GENERATOR" -Denable_documentation=OFF $WORKSPACE
+make dist -j$NUMBER_OF_PROCESSORS
+tar xzf `cat VERSION`.tar.gz
+cd `cat VERSION`
+
+cmake -G"$GENERATOR"\
+  -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
   -Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
-  -Denable_compile_optimization=$(onoff test "$build_mode" = "Debug") \
+  -Denable_compile_optimizations=$(onoff test "$build_mode" = "Debug") \
   -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \
@@ -63,14 +72,14 @@ cmake -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
   -Denable_compile_warnings=ON -Denable_smpi=ON -Denable_lib_static=OFF \
   -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF \
   -Denable_tracing=ON -Denable_java=ON
-make VERBOSE=1
+make -j$NUMBER_OF_PROCESSORS VERBOSE=1
 
 cd $WORKSPACE/build
 cd `cat VERSION`
 
 TRES=0
 
-ctest -T test --no-compress-output || true
+ctest -T test --output-on-failure --no-compress-output || true
 if [ -f Testing/TAG ] ; then
    xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults.xml
    mv CTestResults.xml $WORKSPACE