diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-21 22:09:06 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-21 22:09:06 -0800 |
| commit | dd4531fd33781db5fc725b3d75c05092d5390cfd (patch) | |
| tree | 1011cecee5e78ea7e6b757da768578c5e02b9fbf /tools/run_tests/run_tests.py | |
| parent | f315bc198009eff04a53e48cec9b9506c85a2417 (diff) | |
| parent | 17ddc83b33da0befa0d9f7395b04ea3ecaff6854 (diff) | |
Merge github.com:grpc/grpc into cleaner-posix
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index de3716bc88..0b3efa29e3 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -334,13 +334,14 @@ class RubyLanguage(object): def test_specs(self, config, args): return [config.job_spec(['tools/run_tests/run_ruby.sh'], None, + timeout_seconds=10*60, environ=_FORCE_ENVIRON_FOR_WRAPPERS)] def pre_build_steps(self): return [['tools/run_tests/pre_build_ruby.sh']] def make_targets(self, test_regex): - return ['static_c'] + return [] def make_options(self): return [] @@ -1197,4 +1198,3 @@ else: if BuildAndRunError.POST_TEST in errors: exit_code |= 4 sys.exit(exit_code) - |