Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(541)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: masters/master.client.webrtc/master_linux_cfg.py

Issue 16959006: Refactor WebRTC master configs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Fixed minor errors. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « masters/master.client.webrtc/master.cfg ('k') | masters/master.client.webrtc/master_mac_cfg.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/master.client.webrtc/master_linux_cfg.py
diff --git a/masters/master.client.webrtc/master_linux_cfg.py b/masters/master.client.webrtc/master_linux_cfg.py
index 3e4f1f7df95e11f432e9a5a55a9ef81cbd163952..56dfe540eb793ba89c9852e82a2ea565ce472650 100644
--- a/masters/master.client.webrtc/master_linux_cfg.py
+++ b/masters/master.client.webrtc/master_linux_cfg.py
@@ -9,115 +9,114 @@ from master.factory import webrtc_factory
defaults = {}
-def ConfigureBuilders(c, svn_url, branch, custom_deps_list=None):
- def linux():
- return webrtc_factory.WebRTCFactory('src/out', 'linux2', svn_url,
- branch, custom_deps_list)
- def android():
- return webrtc_factory.WebRTCFactory('', 'linux2', svn_url,
- branch, nohooks_on_update=True,
- target_os='android')
-
- helper = master_config.Helper(defaults)
- B = helper.Builder
- F = helper.Factory
- S = helper.Scheduler
-
- scheduler = 'webrtc_linux_scheduler'
- S(scheduler, branch=branch, treeStableTimer=0)
-
- tests = [
- 'audio_decoder_unittests',
- 'common_audio_unittests',
- 'common_video_unittests',
- 'metrics_unittests',
- 'modules_integrationtests',
- 'modules_unittests',
- 'neteq_unittests',
- 'system_wrappers_unittests',
- 'test_support_unittests',
- 'tools_unittests',
- 'video_engine_core_unittests',
- 'voice_engine_unittests',
- ]
-
- ninja_options = ['--build-tool=ninja']
-
- defaults['category'] = 'linux'
-
- B('Linux32 Debug', 'linux32_debug_factory', scheduler=scheduler)
- F('linux32_debug_factory', linux().WebRTCFactory(
- target='Debug',
- options=ninja_options,
- tests=tests,
- factory_properties={'gclient_env': {'GYP_DEFINES': 'target_arch=ia32'}}))
- B('Linux32 Release', 'linux32_release_factory', scheduler=scheduler)
- F('linux32_release_factory', linux().WebRTCFactory(
- target='Release',
- options=ninja_options,
- tests=tests,
- factory_properties={'gclient_env': {'GYP_DEFINES': 'target_arch=ia32'}}))
-
- B('Linux64 Debug', 'linux64_debug_factory', scheduler=scheduler)
- F('linux64_debug_factory', linux().WebRTCFactory(
- target='Debug',
- options=ninja_options,
- tests=tests))
- B('Linux64 Release', 'linux64_release_factory', scheduler=scheduler)
- F('linux64_release_factory', linux().WebRTCFactory(
- target='Release',
- options=ninja_options,
- tests=tests))
-
- B('Linux Clang', 'linux_clang_factory', scheduler=scheduler)
- F('linux_clang_factory', linux().WebRTCFactory(
- target='Debug',
- options=ninja_options,
- tests=tests,
- factory_properties={'gclient_env': {'GYP_DEFINES': 'clang=1'}}))
-
- B('Linux Memcheck', 'linux_memcheck_factory', scheduler=scheduler)
- F('linux_memcheck_factory', linux().WebRTCFactory(
- target='Release',
- options=ninja_options,
- tests=tests,
- factory_properties={'needs_valgrind': True,
- 'gclient_env':
- {'GYP_DEFINES': 'build_for_tool=memcheck'}}))
- B('Linux Tsan', 'linux_tsan_factory', scheduler=scheduler)
- F('linux_tsan_factory', linux().WebRTCFactory(
- target='Release',
- options=ninja_options,
- tests=tests,
- factory_properties={'needs_valgrind': True,
- 'gclient_env':
- {'GYP_DEFINES': 'build_for_tool=tsan'}}))
- B('Linux Asan', 'linux_asan_factory', scheduler=scheduler)
- F('linux_asan_factory', linux().WebRTCFactory(
- target='Release',
- options=ninja_options,
- tests=tests,
- factory_properties={'asan': True,
- 'gclient_env':
- {'GYP_DEFINES': ('asan=1 release_extra_cflags=-g '
- ' linux_use_tcmalloc=0 ')}}))
-
- # Android.
- B('Android NDK', 'android_ndk_factory', scheduler=scheduler)
- F('android_ndk_factory', android().ChromiumAnnotationFactory(
+def linux():
+ return webrtc_factory.WebRTCFactory('src/out', 'linux2')
+def android():
+ return webrtc_factory.WebRTCFactory('', 'linux2', nohooks_on_update=True,
+ target_os='android')
+
+helper = master_config.Helper(defaults)
+B = helper.Builder
+F = helper.Factory
+S = helper.Scheduler
+
+scheduler = 'webrtc_linux_scheduler'
+S(scheduler, branch='trunk', treeStableTimer=0)
+
+tests = [
+ 'audio_decoder_unittests',
+ 'common_audio_unittests',
+ 'common_video_unittests',
+ 'metrics_unittests',
+ 'modules_integrationtests',
+ 'modules_unittests',
+ 'neteq_unittests',
+ 'system_wrappers_unittests',
+ 'test_support_unittests',
+ 'tools_unittests',
+ 'video_engine_core_unittests',
+ 'voice_engine_unittests',
+]
+
+ninja_options = ['--build-tool=ninja']
+
+defaults['category'] = 'linux'
+
+B('Linux32 Debug', 'linux32_debug_factory', scheduler=scheduler)
+F('linux32_debug_factory', linux().WebRTCFactory(
target='Debug',
- slave_type='AnnotatedBuilderTester',
- annotation_script='src/build/android/buildbot/bb_run_bot.py',
- factory_properties={
- 'android_bot_id': 'webrtc-builder-dbg',
- }))
-
- # ChromeOS.
- B('Chrome OS', 'chromeos_factory', scheduler=scheduler)
- F('chromeos_factory', linux().WebRTCFactory(
- target='Debug',
- options=ninja_options,
- tests=tests,
- factory_properties={'gclient_env': {'GYP_DEFINES': 'chromeos=1'}}))
+ options=ninja_options,
+ tests=tests,
+ factory_properties={'gclient_env': {'GYP_DEFINES': 'target_arch=ia32'}}))
+B('Linux32 Release', 'linux32_release_factory', scheduler=scheduler)
+F('linux32_release_factory', linux().WebRTCFactory(
+ target='Release',
+ options=ninja_options,
+ tests=tests,
+ factory_properties={'gclient_env': {'GYP_DEFINES': 'target_arch=ia32'}}))
+
+B('Linux64 Debug', 'linux64_debug_factory', scheduler=scheduler)
+F('linux64_debug_factory', linux().WebRTCFactory(
+ target='Debug',
+ options=ninja_options,
+ tests=tests))
+B('Linux64 Release', 'linux64_release_factory', scheduler=scheduler)
+F('linux64_release_factory', linux().WebRTCFactory(
+ target='Release',
+ options=ninja_options,
+ tests=tests))
+
+B('Linux Clang', 'linux_clang_factory', scheduler=scheduler)
+F('linux_clang_factory', linux().WebRTCFactory(
+ target='Debug',
+ options=ninja_options,
+ tests=tests,
+ factory_properties={'gclient_env': {'GYP_DEFINES': 'clang=1'}}))
+
+B('Linux Memcheck', 'linux_memcheck_factory', scheduler=scheduler)
+F('linux_memcheck_factory', linux().WebRTCFactory(
+ target='Release',
+ options=ninja_options,
+ tests=tests,
+ factory_properties={'needs_valgrind': True,
+ 'gclient_env':
+ {'GYP_DEFINES': 'build_for_tool=memcheck'}}))
+B('Linux Tsan', 'linux_tsan_factory', scheduler=scheduler)
+F('linux_tsan_factory', linux().WebRTCFactory(
+ target='Release',
+ options=ninja_options,
+ tests=tests,
+ factory_properties={'needs_valgrind': True,
+ 'gclient_env':
+ {'GYP_DEFINES': 'build_for_tool=tsan'}}))
+B('Linux Asan', 'linux_asan_factory', scheduler=scheduler)
+F('linux_asan_factory', linux().WebRTCFactory(
+ target='Release',
+ options=ninja_options,
+ tests=tests,
+ factory_properties={'asan': True,
+ 'gclient_env':
+ {'GYP_DEFINES': ('asan=1 release_extra_cflags=-g '
+ ' linux_use_tcmalloc=0 ')}}))
+
+# Android.
+B('Android NDK', 'android_ndk_factory', scheduler=scheduler)
+F('android_ndk_factory', android().ChromiumAnnotationFactory(
+ target='Debug',
+ slave_type='AnnotatedBuilderTester',
+ annotation_script='src/build/android/buildbot/bb_run_bot.py',
+ factory_properties={
+ 'android_bot_id': 'webrtc-builder-dbg',
+ }))
+
+# ChromeOS.
+B('Chrome OS', 'chromeos_factory', scheduler=scheduler)
+F('chromeos_factory', linux().WebRTCFactory(
+ target='Debug',
+ options=ninja_options,
+ tests=tests,
+ factory_properties={'gclient_env': {'GYP_DEFINES': 'chromeos=1'}}))
+
+def Update(c):
helper.Update(c)
« no previous file with comments | « masters/master.client.webrtc/master.cfg ('k') | masters/master.client.webrtc/master_mac_cfg.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698