From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 13 Apr 2018 19:58:41 +0000 (+0200)
Subject: jenkins: also install MC builds, somewhere else
X-Git-Tag: v3.20~428
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f2997944df00f705042317b8b65e39406e0310a2?ds=sidebyside

jenkins: also install MC builds, somewhere else
---

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 36b6ea90d5..1ce50ae751 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -126,8 +126,12 @@ echo "XX Configure and build SimGrid"
 echo "XX   pwd: "$(pwd)
 echo "XX"
 set -x
-cmake -G"$GENERATOR"\
-  -DCMAKE_INSTALL_PREFIX=/builds/simgrid_install \
+if [ "$build_mode" = "ModelChecker" ] ;
+   INSTALL="-DCMAKE_INSTALL_PREFIX=/builds/mc_simgrid_install"
+elif [ "$build_mode" = "Debug" ] ;
+   INSTALL="-DCMAKE_INSTALL_PREFIX=/builds/simgrid_install"
+fi
+cmake -G"$GENERATOR" $INSTALL \
   -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
   -Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
   -Denable_smpi_ISP_testsuite=$(onoff test "$build_mode" = "ModelChecker") \
@@ -159,12 +163,14 @@ if [ -f Testing/TAG ] ; then
    mv CTestResults.xml $WORKSPACE
 fi
 
-if test "$(uname)" != "Msys" -a "${build_mode}" = "Debug" ; then
+if test "$(uname)" != "Msys" && test "${build_mode}" = "Debug" -o "${build_mode}" = "ModelChecker" ; then
   echo "XX"
-  echo "XX Test done. Install everything since it's a regular build + not on a Windows."
+  echo "XX Test done. Install everything since it's a regular build, not on a Windows."
   echo "XX"
 
-  rm -rf /builds/simgrid_install
+  test "${build_mode}" = "Debug"        && rm -rf /builds/simgrid_install
+  test "${build_mode}" = "ModelChecker" && rm -rf /builds/mc_simgrid_install
+
   make install
 fi