diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-11 21:00:08 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-11 21:00:08 +0200 |
| commit | 7f074e0e20872de5720d6f5f2e77d4add7bed84a (patch) | |
| tree | 72987b668b1bab3f4837cd073049ef4787048151 /tools/run_tests/run_tests.py | |
| parent | 2c779d64db4b4e460c697b59170f85135d552db5 (diff) | |
| parent | dae95b4e3608bbb4d012e10627fea6d2e74b48a0 (diff) | |
Merge branch 'v1.0.x' into manual-upmerge
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 8be15dda4e..9e6ba380f1 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -701,14 +701,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=30*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=30*60, + shortname='objc-examples-build', + environ=_FORCE_ENVIRON_FOR_WRAPPERS), + ] def pre_build_steps(self): return [] |