diff options
| author |  makdharma <makdharma@users.noreply.github.com> | 2016-08-08 15:07:49 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-08 15:07:49 -0700 |
| commit | 97f6994b98a273f5007044afcaf48909f147097d (patch) | |
| tree | 1456efea0f0a0db7515bdd4567e2e269b912c7d2 /tools/run_tests/run_tests.py | |
| parent | 4e57e8be3911e3030e2ccfd6478be75a3c2b0250 (diff) | |
| parent | 0275d8c65b7bd509b76cc46b2314078dd785c6e7 (diff) | |
Merge pull request #7475 from jcanizales/p0-advance-protobuf-version
Update protobuf to 3.0.0 (GA) and the gRPC plugin to -pre1.2
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 5002bf47a4..8dcffd77d0 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -690,14 +690,16 @@ 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'], - timeout_seconds=None, - shortname='objc-tests', - environ=_FORCE_ENVIRON_FOR_WRAPPERS), - self.config.job_spec(['src/objective-c/tests/build_example_test.sh'], - timeout_seconds=15*60, - shortname='objc-examples-build', - 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'], + timeout_seconds=15*60, + shortname='objc-examples-build', + environ=_FORCE_ENVIRON_FOR_WRAPPERS), + ] def pre_build_steps(self): return [] |