aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2017-08-02 10:10:52 +0200
committerGravatar Jan Tattermusch <jtattermusch@google.com>2017-08-10 10:38:06 +0200
commit9359e5004552fa14513f45a49275b55d33522548 (patch)
tree958538df442ead73d7f4b807e03310ba0af18955 /tools
parent593a22a95cf6759f717efceb9ac0f1efe75c4ef6 (diff)
objc tests cleanup
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run_tests/run_tests.py37
1 files changed, 34 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 19186bea12..fd05d9740e 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -889,10 +889,41 @@ class ObjCLanguage(object):
timeout_seconds=60*60,
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',
+ self.config.job_spec(['src/objective-c/tests/run_plugin_tests.sh'],
+ timeout_seconds=60*60,
+ shortname='objc-plugin-tests',
environ=_FORCE_ENVIRON_FOR_WRAPPERS),
+ self.config.job_spec(['src/objective-c/tests/build_one_example.sh'],
+ timeout_seconds=10*60,
+ shortname='objc-build-example-helloworld',
+ environ={'SCHEME': 'HelloWorld',
+ 'EXAMPLE_PATH': 'examples/objective-c/helloworld'}),
+ self.config.job_spec(['src/objective-c/tests/build_one_example.sh'],
+ timeout_seconds=10*60,
+ shortname='objc-build-example-routeguide',
+ environ={'SCHEME': 'RouteGuideClient',
+ 'EXAMPLE_PATH': 'examples/objective-c/route_guide'}),
+ self.config.job_spec(['src/objective-c/tests/build_one_example.sh'],
+ timeout_seconds=10*60,
+ shortname='objc-build-example-authsample',
+ environ={'SCHEME': 'AuthSample',
+ 'EXAMPLE_PATH': 'examples/objective-c/auth_sample'}),
+ self.config.job_spec(['src/objective-c/tests/build_one_example.sh'],
+ timeout_seconds=10*60,
+ shortname='objc-build-example-sample',
+ environ={'SCHEME': 'Sample',
+ 'EXAMPLE_PATH': 'src/objective-c/examples/Sample'}),
+ self.config.job_spec(['src/objective-c/tests/build_one_example.sh'],
+ timeout_seconds=10*60,
+ shortname='objc-build-example-sample-frameworks',
+ environ={'SCHEME': 'Sample',
+ 'EXAMPLE_PATH': 'src/objective-c/examples/Sample',
+ 'FRAMEWORKS': 'YES'}),
+ self.config.job_spec(['src/objective-c/tests/build_one_example.sh'],
+ timeout_seconds=10*60,
+ shortname='objc-build-example-switftsample',
+ environ={'SCHEME': 'SwiftSample',
+ 'EXAMPLE_PATH': 'src/objective-c/examples/SwiftSample'}),
]
def pre_build_steps(self):