| Index: masters/master.client.webrtc/master_mac_cfg.py
|
| diff --git a/masters/master.client.webrtc/master_mac_cfg.py b/masters/master.client.webrtc/master_mac_cfg.py
|
| index 3af87396a4fc5bf4ff108511d027cefd1b12d6a9..2e89f5d84cb8c243db4631a4b644695e9e50f194 100644
|
| --- a/masters/master.client.webrtc/master_mac_cfg.py
|
| +++ b/masters/master.client.webrtc/master_mac_cfg.py
|
| @@ -10,7 +10,7 @@ defaults = {}
|
|
|
| def ConfigureBuilders(c, svn_url, branch, custom_deps_list=None):
|
| def mac():
|
| - return webrtc_factory.WebRTCFactory('src/xcodebuild', 'darwin', svn_url,
|
| + return webrtc_factory.WebRTCFactory('src/out', 'darwin', svn_url,
|
| branch, custom_deps_list)
|
| def macIos():
|
| return webrtc_factory.WebRTCFactory('', 'darwin', svn_url, branch,
|
| @@ -39,7 +39,14 @@ def ConfigureBuilders(c, svn_url, branch, custom_deps_list=None):
|
| 'voice_engine_unittests',
|
| ]
|
|
|
| - options = ['--', '-project', '../webrtc.xcodeproj']
|
| + baremetal_tests = [
|
| + 'audio_device_integrationtests',
|
| + 'video_capture_integrationtests',
|
| + 'vie_auto_test',
|
| + 'voe_auto_test',
|
| + ]
|
| +
|
| + options = ['--build-tool=ninja']
|
|
|
| defaults['category'] = 'mac'
|
|
|
| @@ -84,6 +91,21 @@ def ConfigureBuilders(c, svn_url, branch, custom_deps_list=None):
|
| ' release_extra_cflags=-g '
|
| ' linux_use_tcmalloc=0 ')}}))
|
|
|
| + B('Mac32 Release [large tests]', 'mac_largetests_factory',
|
| + scheduler=scheduler)
|
| + F('mac_largetests_factory', mac().WebRTCFactory(
|
| + target='Release',
|
| + options=options,
|
| + tests=baremetal_tests,
|
| + factory_properties={
|
| + 'show_perf_results': True,
|
| + 'expectations': True,
|
| + 'perf_id': 'webrtc-mac-large-tests',
|
| + 'perf_measuring_tests': ['vie_auto_test'],
|
| + 'custom_cmd_line_tests': ['vie_auto_test',
|
| + 'voe_auto_test'],
|
| + }))
|
| +
|
| # iOS.
|
| B('iOS Device', 'ios_release_factory', scheduler=scheduler)
|
| F('ios_release_factory', macIos().ChromiumAnnotationFactory(
|
|
|