X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6fbcdfade89b3812c24152c86f8aa3be510df7f2..f50afc03bed61a42cd816ce73fa48aedd1331fcc:/tools/jenkins/build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 131f03c21d..9c8fc76470 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -10,10 +10,9 @@ export LC_ALL=C
 
 echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
 rm -f /tmp/cc*
+rm -f /tmp/simgrid-mc-*
 rm -f /tmp/*.so
 rm -f /tmp/*.so.*
-rm -rf /tmp/jvm-*
-find $WORKSPACE -name "hs_err_pid*.log" -exec rm -f {} +
 ls /tmp
 df -h
 echo "XXXX Let's go"
@@ -143,11 +142,6 @@ if [ "$os" = "Debian" ] ; then
     have_NS3="yes"
   fi
 fi
-MAY_HINT_AT_NS3=""
-if [ $NODE_NAME = "ubuntu-lts" ] ; then
-  MAY_HINT_AT_NS3="-DNS3_HINT=/builds/ns-3-dev/build/"
-  have_NS3="yes"
-fi
 if [ "$os" = "nixos" ] ; then
   have_NS3="yes"
 fi
@@ -186,14 +180,6 @@ echo "XX   pwd: $(pwd)"
 echo "XX"
 set -x
 
-if cmake --version | grep -q 3\.11 ; then
-  # -DCMAKE_DISABLE_SOURCE_CHANGES=ON is broken with java on CMake 3.11
-  # https://gitlab.kitware.com/cmake/cmake/issues/17933
-  MAY_DISABLE_SOURCE_CHANGE=""
-else
-  MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
-fi
-
 if [ "$os" = "CentOS" ]; then
     if [ "$(ld -v | cut -d\  -f4 | cut -c1-4)" = "2.30" ]; then
         echo "Temporary disable LTO, believed to be broken on this system."
@@ -219,12 +205,10 @@ cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
   -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
   -Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
   -DSIMGRID_PYTHON_LIBDIR=${SIMGRID_PYTHON_LIBDIR} \
-  ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} ${MAY_HINT_AT_NS3} \
-  -Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \
+  -DCMAKE_DISABLE_SOURCE_CHANGES=ON ${MAY_DISABLE_LTO} \
   -DLTO_EXTRA_FLAG="auto" \
   -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
   "$SRCFOLDER"
-set +x
 
 make -j $NUMBER_OF_PROCESSORS VERBOSE=1 tests