Merge branch 'master' of github.com:mquinson/simgrid

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 32b598c..ec2325a 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -7,9 +7,12 @@
 
 set -e
 
-# Cleanup previous attempts
-rm -rf /tmp/simgrid*tmp
-rm -rf /tmp/surf-java*tmp
+echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
+rm -rf /tmp/simgrid-java*
+find /builds/workspace/SimGrid-Multi/ -name "hs_err_pid*.log" | xargs rm -f
+ls /tmp
+df -h
+echo "XXXX Let's go"
 
 # Help older cmakes
 if [ -e /usr/lib/jvm/java-7-openjdk-amd64 ] ; 
@@ -35,6 +38,12 @@ onoff() {
   fi
 }
 
+# Check that we have what we need, or die quickly
+test -e /bin/tar  || die "I need tar to compile. Please fix your slave."
+test -e /bin/gzip || die "I need gzip to compile. Please fix your slave."
+test -e /usr/include/libunwind.h || die "I need libunwind to compile. Please fix your slave."
+test -e /usr/include/valgrind/valgrind.h || die "I need valgrind to compile. Please fix your slave."
+
 build_mode="$1"
 echo "Build mode $build_mode on $(uname -np)" >&2
 case "$build_mode" in