From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 27 Jul 2015 15:00:00 +0000 (+0200)
Subject: jenkins fun
X-Git-Tag: v3_12~370
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/68e4963f7567ad9a1c5c7d09c492ea1d90112f90

jenkins fun

- Don't display the build mode before it's set
- On Windows, the command die does not exist
---

diff --git a/buildtools/jenkins/build.sh b/buildtools/jenkins/build.sh
index f79bd105dd..1c6773f831 100755
--- a/buildtools/jenkins/build.sh
+++ b/buildtools/jenkins/build.sh
@@ -6,9 +6,9 @@ echo "Running $0 with arguments:" >&2
 for arg in "$@"; do
   echo "- $arg"
 done
-echo "Build mode was $build_mode" >&1
 
 build_mode="$1"
+echo "Build mode $build_mode on $(uname -np)" >&2
 case "$build_mode" in
   "Debug")
   ;;
@@ -24,11 +24,11 @@ case "$build_mode" in
       echo "On Windows, jenkins is not willing to expand variables for some reason" >&2
       echo "Force use Debug mode" >&2
     else
-      die 1 "Unknown build_mode $build_mode"
+      echo "Unknown build_mode $build_mode"
+      exit 1
     fi
   ;;
 esac
-echo "Build mode $build_mode on $(uname -np)" >&2
 
 if test "$(uname -o)" = "Msys"; then
   if [ -z "$NUMBER_OF_PROCESSORS" ]; then