simplify scripts

pull/4885/head
Jan Tattermusch 9 years ago
parent 6812f4ee35
commit 1961a80e28
  1. 45
      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

Loading…
Cancel
Save