X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12842107c688359b7e8806bd8cc4a092a3b913ae..79b7f7a89ad565a17012ee12c9774c1bd9fa508c:/tools/jenkins/build.sh diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index e05907ff2f..72a3f5709f 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -26,7 +26,7 @@ fi # usage: die status message... die () { - local status=${1:-1} + status=${1:-1} shift [ $# -gt 0 ] || set -- "Error - Halting" echo "$@" >&2 @@ -72,8 +72,7 @@ elif [ -f /etc/debian_version ]; then os=Debian ver=$(cat /etc/debian_version) elif [ -f /etc/redhat-release ]; then - os="" - ver=$(cat /etc/redhat-release) + read -r os ver < /etc/redhat-release elif [ -f /usr/bin/sw_vers ]; then os=$(sw_vers -productName) ver=$(sw_vers -productVersion) @@ -163,7 +162,7 @@ echo "XX pwd: "$(pwd) echo "XX" cmake -G"$GENERATOR" -Denable_documentation=OFF $WORKSPACE -make dist -j$NUMBER_OF_PROCESSORS +make dist -j $NUMBER_OF_PROCESSORS SIMGRID_VERSION=$(cat VERSION) echo "XX" @@ -211,7 +210,7 @@ cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \ # -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \ set +x -make -j$NUMBER_OF_PROCESSORS VERBOSE=1 tests +make -j $NUMBER_OF_PROCESSORS VERBOSE=1 tests echo "XX" echo "XX Run the tests"