aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/jenkins/run_jenkins.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tools/jenkins/run_jenkins.sh')
-rwxr-xr-xtools/jenkins/run_jenkins.sh45
1 files changed, 5 insertions, 40 deletions
diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh
index 49b2fa55c2..884a121df3 100755
--- a/tools/jenkins/run_jenkins.sh
+++ b/tools/jenkins/run_jenkins.sh
@@ -39,51 +39,16 @@
# NOTE: No empty lines should appear in this file before igncr is set!
set -ex -o igncr || set -ex
-# Grabbing the machine's architecture
-arch=`uname -m`
-
-case $platform in
- i386)
- arch="i386"
- platform="linux"
- docker_suffix=_32bits
- ;;
-esac
-
if [ "$platform" == "linux" ]
then
- echo "building $language on Linux"
-
- ./tools/run_tests/run_tests.py --use_docker -t -l $language -c $config -x report.xml -j 3 $@ || TESTS_FAILED="true"
-
-elif [ "$platform" == "windows" ]
-then
- echo "building $language on Windows"
-
- # Prevent msbuild from picking up "platform" env variable, which would break the build
- unset platform
-
- python tools/run_tests/run_tests.py -t -l $language -c $config -x report.xml -j 3 $@ || TESTS_FAILED="true"
-
-elif [ "$platform" == "macos" ]
-then
- echo "building $language on MacOS"
-
- # Prevent msbuild from picking up "platform" env variable, which would break the build
- unset platform
-
- ./tools/run_tests/run_tests.py -t -l $language -c $config -x report.xml -j 3 $@ || TESTS_FAILED="true"
-
+ USE_DOCKER_MAYBE="--use_docker"
elif [ "$platform" == "freebsd" ]
-then
- echo "building $language on FreeBSD"
+ export MAKE=gmake
+fi
- MAKE=gmake ./tools/run_tests/run_tests.py -t -l $language -c $config -x report.xml -j 3 $@ || TESTS_FAILED="true"
+unset platform # variable named 'platform' breaks the windows build
-else
- echo "Unknown platform $platform"
- exit 1
-fi
+python tools/run_tests/run_tests.py $USE_DOCKER_MAYBE -t -l $language -c $config -x report.xml -j 3 $@ || TESTS_FAILED="true"
if [ ! -e reports/index.html ]
then