diff options
| author |  makdharma <makdharma@users.noreply.github.com> | 2016-07-08 09:40:22 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-08 09:40:22 -0700 |
| commit | 5a412cf891e8d58affeb308849d92778de5e38a9 (patch) | |
| tree | 73f8e8b48668c7877c830188e34a11c0532d7f41 /tools | |
| parent | c28a6c1b3b4d68da7661997cd56d305b254a7d0b (diff) | |
| parent | 60fec9e547bc6fac2a2ba1e6dad47950d7d5042e (diff) | |
Merge pull request #7219 from jcanizales/merge-0.14-into-master
Merge 0.14 into master
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index e1b7cf550f..cbe17ee2ad 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -633,10 +633,13 @@ class ObjCLanguage(object): _check_compiler(self.args.compiler, ['default']) def test_specs(self): - return [self.config.job_spec(['src/objective-c/tests/run_tests.sh'], None, - environ=_FORCE_ENVIRON_FOR_WRAPPERS), + return [self.config.job_spec(['src/objective-c/tests/run_tests.sh'], + timeout_seconds=None, + shortname='objc-tests', + environ=_FORCE_ENVIRON_FOR_WRAPPERS), self.config.job_spec(['src/objective-c/tests/build_example_test.sh'], - None, timeout_seconds=15*60, + timeout_seconds=15*60, + shortname='objc-examples-build', environ=_FORCE_ENVIRON_FOR_WRAPPERS)] def pre_build_steps(self): |