diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-17 14:36:45 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-17 14:36:45 -0700 |
| commit | af26143b6fc76559f0907aadfc9f23c4e2e60844 (patch) | |
| tree | 2805cc3317954094eb8baf8a30898b1a93bbc00f /tools/jenkins/run_jenkins.sh | |
| parent | 232e04b6199090b5805b3e7148fcfce3b8ef9956 (diff) | |
| parent | fea28b79fb0a211b2ea8515dab25db19099ea595 (diff) | |
Merge github.com:grpc/grpc into i-want-to-wait-free
Diffstat (limited to 'tools/jenkins/run_jenkins.sh')
| -rwxr-xr-x | tools/jenkins/run_jenkins.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh index dcd0424aec..8cb85cb12b 100755 --- a/tools/jenkins/run_jenkins.sh +++ b/tools/jenkins/run_jenkins.sh @@ -31,6 +31,8 @@ # This script is invoked by Jenkins and triggers a test run based on # env variable settings. # +# Setting up rvm environment BEFORE we set -ex. +[[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh # To prevent cygwin bash complaining about empty lines ending with \r # we set the igncr option. The option doesn't exist on Linux, so we fallback # to just 'set -ex' there. |