X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8919dc9cd4f522f7dc9d397e1037dce8d6bd63ac..887a3af169c81ac0615ecc0a64fbbf2bebae9a3d:/tools/jenkins/build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 0e66fd62a1..3f24abedb5 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -12,8 +12,9 @@ export LC_ALL=C
 
 echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
 rm -rf /tmp/simgrid-java*
+rm -rf /var/tmp/simgrid-java*
 rm -rf /tmp/jvm-*
-find /builds/workspace/SimGrid/ -name "hs_err_pid*.log" | xargs rm -f
+find /builds/workspace/SimGrid/ -name "hs_err_pid*.log" -exec rm -f {} +
 ls /tmp
 df -h
 echo "XXXX Let's go"
@@ -42,46 +43,28 @@ onoff() {
   fi
 }
 
-# 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."
-
-if type lsb_release >/dev/null 2>&1; then
-  if [ -f /mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe ]; then
-    #To identify the windows underneath the winbuntu
-    PATH="/mnt/c/Windows/System32/WindowsPowerShell/v1.0/:$PATH"
-    major=$(powershell.exe -command "[environment]::OSVersion.Version.Major" | sed 's/\r//g')
-    build=$(powershell.exe -command "[environment]::OSVersion.Version.Build"| sed 's/\r//g')
-    os=Windows
-    ver="$major v$build - WSL $(lsb_release -sd)"
-  else
+if type lsb_release >/dev/null 2>&1; then # recent versions of Debian/Ubuntu
     # linuxbase.org
     os=$(lsb_release -si)
     ver="$(lsb_release -sr) ($(lsb_release -sc))"
-  fi
-elif [ -f /etc/lsb-release ]; then
-    # For some versions of Debian/Ubuntu without lsb_release command
+elif [ -f /etc/lsb-release ]; then # For some versions of Debian/Ubuntu without lsb_release command
     . /etc/lsb-release
     os=$DISTRIB_ID
     ver=$DISTRIB_RELEASE
-elif [ -f /etc/debian_version ]; then
-    # Older Debian/Ubuntu/etc.
+elif [ -f /etc/debian_version ]; then # Older Debian/Ubuntu/etc.
     os=Debian
     ver=$(cat /etc/debian_version)
-elif [ -f /etc/redhat-release ]; then
-    os=""
-    ver=$(cat /etc/redhat-release)
-elif [ -f /usr/bin/sw_vers ]; then
+elif [ -f /etc/redhat-release ]; then #RH, Fedora, Centos
+    read -r os ver < /etc/redhat-release
+elif [ -f /usr/bin/sw_vers ]; then #osx
     os=$(sw_vers -productName)
     ver=$(sw_vers -productVersion)
-elif [ -f /bin/freebsd-version ]; then
+elif [ -f /bin/freebsd-version ]; then #freebsd
     os=$(uname -s)
     ver=$(freebsd-version -u)
-elif [ -f /etc/os-release ]; then
-    # freedesktop.org and systemd, put last as usually missing useful info
+elif [ -f /etc/release ]; then #openindiana
+    read -r os ver < /etc/release
+elif [ -f /etc/os-release ]; then # freedesktop.org and systemd, put last as usually missing useful info
     . /etc/os-release
     os=$NAME
     ver=$VERSION_ID
@@ -91,6 +74,17 @@ else
     os=$(uname -s)
     ver=$(uname -r)
 fi
+
+# Are we running on wsl ?
+if [ -f /mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe ]; then
+    #To identify the windows underneath the linux
+    PATH="/mnt/c/Windows/System32/WindowsPowerShell/v1.0/:$PATH"
+    major=$(powershell.exe -command "[environment]::OSVersion.Version.Major" | sed 's/\r//g')
+    build=$(powershell.exe -command "[environment]::OSVersion.Version.Build"| sed 's/\r//g')
+    ver= "$major v$build - WSL $os $ver"
+    os=Windows
+fi
+
 case $(uname -m) in
 x86_64)
     bits="64 bits"
@@ -189,7 +183,7 @@ else
   MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
 fi
 
-if [ "$os" = "NixOS" -a "$(gcc -dumpversion)" = "7.4.0" ]; then
+if [ "$os" = "NixOS" ] && [ "$(gcc -dumpversion)" = "7.4.0" ]; then
     echo "Temporary disable LTO, believed to be broken on this system."
     MAY_DISABLE_LTO=-Denable_lto=OFF
 else
@@ -219,10 +213,6 @@ echo "XX   pwd: "$(pwd)
 echo "XX"
 
 ctest -T test --output-on-failure --no-compress-output || true
-if [ -f Testing/TAG ] ; then
-   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/$( head -n 1 < Testing/TAG )/Test.xml > CTestResults.xml
-   mv CTestResults.xml $WORKSPACE
-fi
 
 if test -n "$INSTALL" && [ ${branch_name} = "origin/master" ] ; then
   echo "XX"