Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 1421468..eaae782 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -47,7 +47,7 @@ onoff() {
 #test -e /bin/tar  || die 1 "I need tar to compile. Please fix your slave."
 #test -e /bin/gzip || die 1 "I need gzip to compile. Please fix your slave."
 #test -e /usr/include/libunwind.h || die 1 "I need libunwind to compile. Please fix your slave."
-#test -e /usr/include/valgrind/valgrind.h || die 1 "I need valgrind to compile. Please fix your slave."
+#test -e /usr/include/valgrind/valgrind.h || die 1 "I need valgrind to compile. Please fix your slave."
 
 build_mode="$1"
 echo "Build mode $build_mode on $(uname -np)" >&2
@@ -83,7 +83,8 @@ echo "XX Get out of the tree"
 echo "XX"
 if [ -d $WORKSPACE/build ]
 then
-  rm -rf $WORKSPACE/build
+  # Windows cannot remove the directory if it's still used by the previous build
+  rm -rf $WORKSPACE/build || sleep 10 && rm -rf $WORKSPACE/build || sleep 10 && rm -rf $WORKSPACE/build
 fi
 mkdir $WORKSPACE/build
 cd $WORKSPACE/build
@@ -94,7 +95,7 @@ PATH="$WORKSPACE/build/lib:$PATH"
 if test "$(uname -o)" != "Msys"; then
   echo "XX"
   echo "XX Build the archive out of the tree"
-  echo "XX   pwd: `pwd`"
+  echo "XX   pwd: "$(pwd)
   echo "XX"
 
   cmake -G"$GENERATOR" -Denable_documentation=OFF $WORKSPACE
@@ -103,9 +104,9 @@ if test "$(uname -o)" != "Msys"; then
   echo "XX"
   echo "XX Open the resulting archive"
   echo "XX"
-  gunzip `cat VERSION`.tar.gz
-  tar xf `cat VERSION`.tar
-  cd `cat VERSION`
+  gunzip $(cat VERSION).tar.gz
+  tar xf $(cat VERSION).tar
+  cd $(cat VERSION)
   mkdir build
   cd build
   SRCFOLDER=".."
@@ -116,7 +117,7 @@ fi
 
 echo "XX"
 echo "XX Configure and build SimGrid"
-echo "XX   pwd: `pwd`"
+echo "XX   pwd: "$(pwd)
 echo "XX"
 cmake -G"$GENERATOR"\
   -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
@@ -134,19 +135,17 @@ make -j$NUMBER_OF_PROCESSORS VERBOSE=1
 
 if test "$(uname -o)" != "Msys"; then
   cd $WORKSPACE/build
-  cd `cat VERSION`/build
+  cd $(cat VERSION)/build
 fi
 
-TRES=0
-
 echo "XX"
 echo "XX Run the tests"
-echo "XX   pwd: `pwd`"
+echo "XX   pwd: "$(pwd)
 echo "XX"
 
 ctest -T test --output-on-failure --no-compress-output || true
 if [ -f Testing/TAG ] ; then
-   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults.xml
+   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/$( head -n 1 < Testing/TAG )/Test.xml > CTestResults.xml
    mv CTestResults.xml $WORKSPACE
 fi