Skip to content
Snippets Groups Projects
Commit ef4aac6d authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

Merge pull request #2644 from nicolasnoble/support-freebsd

Supporting FreeBSD for Jenkins.
parents 8e06c2e6 4243ca87
No related branches found
No related tags found
No related merge requests found
#!/bin/bash #!/bin/sh
# Copyright 2015, Google Inc. # Copyright 2015, Google Inc.
# All rights reserved. # All rights reserved.
# #
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
# This script is invoked by Jenkins and triggers a test run based on # This script is invoked by Jenkins and triggers a test run based on
# env variable settings. # env variable settings.
# #
# Bootstrap into bash
[ -z $1 ] && exec bash $0 bootstrapped
# Setting up rvm environment BEFORE we set -ex. # Setting up rvm environment BEFORE we set -ex.
[[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh [[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh
# To prevent cygwin bash complaining about empty lines ending with \r # To prevent cygwin bash complaining about empty lines ending with \r
...@@ -103,11 +105,18 @@ then ...@@ -103,11 +105,18 @@ then
/cygdrive/c/nuget/nuget.exe restore src/csharp/Grpc.sln /cygdrive/c/nuget/nuget.exe restore src/csharp/Grpc.sln
python tools/run_tests/run_tests.py -t -l $language -x report.xml || true python tools/run_tests/run_tests.py -t -l $language -x report.xml || true
elif [ "$platform" == "macos" ] elif [ "$platform" == "macos" ]
then then
echo "building $language on MacOS" echo "building $language on MacOS"
./tools/run_tests/run_tests.py -t -l $language -c $config -x report.xml || true ./tools/run_tests/run_tests.py -t -l $language -c $config -x report.xml || true
elif [ "$platform" == "freebsd" ]
then
echo "building $language on FreeBSD"
MAKE=gmake ./tools/run_tests/run_tests.py -t -l $language -c $config -x report.xml || true
else else
echo "Unknown platform $platform" echo "Unknown platform $platform"
exit 1 exit 1
......
...@@ -458,7 +458,7 @@ if platform.system() == 'Windows': ...@@ -458,7 +458,7 @@ if platform.system() == 'Windows':
cwd='vsprojects', shell=True) cwd='vsprojects', shell=True)
else: else:
def make_jobspec(cfg, targets): def make_jobspec(cfg, targets):
return jobset.JobSpec(['make', return jobset.JobSpec([os.getenv('MAKE', 'make'),
'-j', '%d' % (multiprocessing.cpu_count() + 1), '-j', '%d' % (multiprocessing.cpu_count() + 1),
'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % 'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' %
args.slowdown, args.slowdown,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment