From 951f3db4d72b1b3d04cfc1d8df565208360b18b0 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sat, 7 Apr 2018 17:01:18 +0200 Subject: [PATCH 1/1] Remove option -o for uname, which is not supported on Darwin. --- tools/jenkins/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index 37fbdb659a..845211eed2 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -66,7 +66,7 @@ case "$build_mode" in ;; esac -if test "$(uname -o)" = "Msys"; then +if test "$(uname)" = "Msys"; then if [ -z "$NUMBER_OF_PROCESSORS" ]; then NUMBER_OF_PROCESSORS=1 fi @@ -98,7 +98,7 @@ echo "XX have_NS3: ${have_NS3}" # This is for Windows: PATH="$WORKSPACE/build/lib:$PATH" -if test "$(uname -o)" != "Msys"; then +if test "$(uname)" != "Msys"; then echo "XX" echo "XX Build the archive out of the tree" echo "XX pwd: "$(pwd) @@ -143,7 +143,7 @@ set +x make -j$NUMBER_OF_PROCESSORS VERBOSE=1 -if test "$(uname -o)" != "Msys"; then +if test "$(uname)" != "Msys"; then cd $WORKSPACE/build cd $(cat VERSION)/build fi @@ -159,7 +159,7 @@ if [ -f Testing/TAG ] ; then mv CTestResults.xml $WORKSPACE fi -if test "$(uname -o)" != "Msys" -a "${build_mode}" = "Debug" ; then +if test "$(uname)" != "Msys" -a "${build_mode}" = "Debug" ; then echo "XX" echo "XX Test done. Install everything since it's a regular build + not on a Windows." echo "XX" -- 2.20.1