Merge branch 'master' of git+ssh://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 8a97109..8935538 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -7,8 +7,10 @@
 
 set -e
 
-echo "XXXX Cleanup previous attempts"
-rm -rf /tmp/simgrid*tmp
+echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
+rm -rf /tmp/simgrid-java*
+rm -rf /tmp/jvm-* 
+find /builds/workspace/SimGrid-Multi/ -name "hs_err_pid*.log" | xargs rm -f
 ls /tmp
 df -h
 echo "XXXX Let's go"
@@ -37,11 +39,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."
+# Check that we have what we need, or die quickly.
+# The paths are not the same on all platforms, unfortunately.
+#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."
 
 build_mode="$1"
 echo "Build mode $build_mode on $(uname -np)" >&2
@@ -110,7 +113,7 @@ cmake -G"$GENERATOR"\
   -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
-  -Denable_compile_warnings=ON -Denable_smpi=ON \
+  -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
   -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF \
   -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \