Duplicate cleanup instructions for jenkins builds in other scripts.

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

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index fa0f683..b10c887 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -145,7 +145,12 @@ mkdir "$WORKSPACE"/build
 cd "$WORKSPACE"/build
 
 have_NS3="no"
-if dpkg -l libns3-dev 2>&1|grep -q "ii  libns3-dev" ; then
+if [ "$os" = "Debian" ] || [ "$os" = "Ubuntu" ] ; then
+  if dpkg --compare-versions "$(dpkg-query -f '${Version}' -W libns3-dev)" ge 3.28; then
+    have_NS3="yes"
+  fi
+fi
+if [ "$os" = "NixOS" ] ; then
   have_NS3="yes"
 fi
 echo "XX have_NS3: ${have_NS3}"
@@ -185,7 +190,7 @@ else
   MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
 fi
 
-if [ "$os" = "CentOS" ] && [ "$(ld -v | cut -d\  -f4)" = "2.30-85.el8" ]; then
+if [ "$os" = "CentOS" ] && [ "$(ld -v | cut -d\  -f4 | cut -c1-4)" = "2.30" ]; then
   echo "Temporary disable LTO, believed to be broken on this system."
   MAY_DISABLE_LTO=-Denable_lto=OFF
 else
@@ -217,7 +222,7 @@ echo "XX Run the tests"
 echo "XX   pwd: "$(pwd)
 echo "XX"
 
-ctest -T test --output-on-failure --no-compress-output || true
+ctest -T test --output-on-failure --no-compress-output -j $NUMBER_OF_PROCESSORS || true
 
 if test -n "$INSTALL" && [ "${branch_name}" = "origin/master" ] ; then
   echo "XX"