X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6c686f5c734739033f848b8009c9b825b7aa9c1d..4bd409ddd2d2f83a5acaa3eea363eaee7012ffbd:/tools/jenkins/build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 9379aef4b8..285d6704a1 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -7,9 +7,18 @@
 
 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 ] ; 
+then
+  export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+fi
 
 # usage: die status message...
 die () {
@@ -29,6 +38,12 @@ onoff() {
   fi
 }
 
+# Check that we have what we need, or die quickly
+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
 case "$build_mode" in
@@ -94,12 +109,14 @@ cmake -G"$GENERATOR"\
   -Denable_smpi_ISP_testsuite=$(onoff test "$build_mode" = "ModelChecker") \
   -Denable_compile_optimizations=$(onoff test "$build_mode" = "Debug") \
   -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode" != "DynamicAnalysis") \
-  -Denable_lua=$(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_lib_static=OFF \
+  -Denable_compile_warnings=ON -Denable_smpi=ON \
   -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF \
-  -Denable_tracing=ON -Denable_java=ON
+  -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF
+#  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
+
+
 make -j$NUMBER_OF_PROCESSORS VERBOSE=1
 
 if test "$(uname -o)" != "Msys"; then
@@ -116,7 +133,7 @@ echo "XX"
 
 ctest -T test --output-on-failure --no-compress-output || true
 if [ -f Testing/TAG ] ; then
-   xsltproc $WORKSPACE/buildtools/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