A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-=
[simgrid.git]
/
tools
/
jenkins
/
build.sh
diff --git
a/tools/jenkins/build.sh
b/tools/jenkins/build.sh
index
3052b0e
..
9162841
100755
(executable)
--- a/
tools/jenkins/build.sh
+++ b/
tools/jenkins/build.sh
@@
-75,7
+75,7
@@
elif [ -f /etc/redhat-release ]; then
os=""
ver=$(cat /etc/redhat-release)
elif [ -f /usr/bin/sw_vers ]; then
os=""
ver=$(cat /etc/redhat-release)
elif [ -f /usr/bin/sw_vers ]; then
- os=$(sw_vers -produc
ls /e
tName)
+ os=$(sw_vers -productName)
ver=$(sw_vers -productVersion)
elif [ -f /bin/freebsd-version ]; then
os=$(uname -s)
ver=$(sw_vers -productVersion)
elif [ -f /bin/freebsd-version ]; then
os=$(uname -s)
@@
-210,7
+210,7
@@
if [ -f Testing/TAG ] ; then
mv CTestResults.xml $WORKSPACE
fi
mv CTestResults.xml $WORKSPACE
fi
-if test -n "$INSTALL"; then
+if test -n "$INSTALL"
&& [ ${BRANCH_NAME} = "master" ]
; then
echo "XX"
echo "XX Test done. Install everything since it's a regular build, not on a Windows."
echo "XX"
echo "XX"
echo "XX Test done. Install everything since it's a regular build, not on a Windows."
echo "XX"