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

Unified Diff: webrtc/build/mb_config.pyl

Issue 2223893002: Add Linux bots to mb_config.pyl. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase CL. Created 4 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/build/mb_config.pyl
diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl
index d49edea51ffe9e95d56a4ddf84da9305fdd5e1d0..dd4d006e4a9f117f6e11e171c99f7b844ba186e2 100644
--- a/webrtc/build/mb_config.pyl
+++ b/webrtc/build/mb_config.pyl
@@ -19,6 +19,7 @@
# page on the buildbots, *not* alphabetically.
'masters': {
'client.webrtc': {
+ # iOS
'iOS32 Debug': 'ios_gyp_debug_bot_arm_device',
'iOS32 Release': 'ios_gyp_release_bot_arm_device',
'iOS64 Debug': 'ios_gyp_debug_bot_arm64_device',
@@ -27,6 +28,23 @@
'iOS64 Debug Simulator': 'ios_gyp_debug_bot_x64',
'iOS64 Debug (GN)': 'ios_gn_debug_bot_arm64_device',
'iOS64 Release (GN)': 'ios_gn_release_bot_arm64_device',
+
+ # Linux
+ 'Linux32 ARM': 'linux_gyp_release_bot_arm',
kjellander_webrtc 2016/08/08 14:47:08 Let's add tryserver.webrtc entries for these too
+ 'Linux32 Debug': 'linux_gyp_debug_bot_x86',
+ 'Linux32 Release': 'linux_gyp_release_bot_x86',
+ 'Linux64 Debug': 'linux_gyp_debug_bot_x64',
+ 'Linux64 Release': 'linux_gyp_release_bot_x64',
+ 'Linux Asan': 'linux_gyp_release_bot_x64_asan',
+ 'Linux Memcheck': 'linux_gyp_release_bot_x64_memcheck',
+ 'Linux MSan': 'linux_gyp_release_bot_x64_msan',
+ 'Linux Tsan v2': 'linux_gyp_release_bot_x64_tsan',
+ 'Linux UBSan': 'linux_gyp_release_bot_x64_ubsan',
+ 'Linux UBSan vptr': 'linux_gyp_release_bot_x64_ubsan_vptr',
+ 'Linux64 Release [large tests]': 'linux_gyp_release_bot_x64',
+ 'Linux64 Debug (GN)': 'linux_gn_debug_bot_x64',
+ 'Linux64 Release (GN)': 'linux_gn_release_bot_x64',
+ 'Linux64 Release (Libfuzzer)': 'linux_gn_release_bot_x64_libfuzzer',
},
'tryserver.webrtc': {
'ios_dbg': 'ios_gyp_debug_bot_arm_device',
@@ -46,6 +64,7 @@
# is not necessarily so (i.e., we might have mac, win, and linux
# bots all using the 'gn_release_bot' config).
'configs': {
+ # iOS
'ios_gn_debug_bot_arm64_device': [
'ios', 'gn', 'debug_bot', 'arm64', 'device'
],
@@ -70,6 +89,50 @@
'ios_gyp_debug_bot_x64': [
'ios', 'gyp', 'release_bot', 'x64'
],
+
+ # Linux
+ 'linux_gyp_release_bot_arm': [
kjellander_webrtc 2016/08/08 14:47:08 Let's try to follow the conventions in Chromium's
kjellander_webrtc 2016/08/08 19:35:30 I didn't get this right - when there is an archite
+ 'gyp', 'release_bot', 'arm'
+ ],
+ 'linux_gyp_debug_bot_x86': [
+ 'gyp', 'debug_bot', 'x86'
+ ],
+ 'linux_gyp_release_bot_x86': [
+ 'gyp', 'release_bot', 'x86'
+ ],
+ 'linux_gyp_debug_bot_x64': [
+ 'gyp', 'debug_bot', 'x64'
+ ],
+ 'linux_gyp_release_bot_x64': [
+ 'gyp', 'release_bot', 'x64'
+ ],
+ 'linux_gyp_release_bot_x64_asan': [
+ 'gyp', 'release_bot', 'x64', 'clang', 'asan', 'lsan'
+ ],
+ 'linux_gyp_release_bot_x64_memcheck': [
+ 'gyp', 'release_bot', 'x64', 'memcheck'
+ ],
+ 'linux_gyp_release_bot_x64_msan': [
+ 'gyp', 'release_bot', 'x64', 'clang', 'msan'
+ ],
+ 'linux_gyp_release_bot_x64_tsan': [
+ 'gyp', 'release_bot', 'x64', 'clang', 'disable_nacl', 'tsan'
+ ],
+ 'linux_gyp_release_bot_x64_ubsan': [
+ 'gyp', 'release_bot', 'x64', 'clang', 'ubsan'
+ ],
+ 'linux_gyp_release_bot_x64_ubsan_vptr': [
+ 'gyp', 'release_bot', 'x64', 'clang', 'ubsan_vptr'
+ ],
+ 'linux_gn_debug_bot_x64': [
+ 'gn', 'debug_bot', 'x64', 'openh264'
+ ],
+ 'linux_gn_release_bot_x64': [
+ 'gn', 'release_bot', 'x64', 'openh264'
+ ],
+ 'linux_gn_release_bot_x64_libfuzzer': [
+ 'gn', 'release_bot', 'x64', 'clang', 'asan', 'libfuzzer'
+ ]
},
# This is a dict mapping a given 'mixin' name to a dict of settings that
@@ -90,6 +153,16 @@
'gyp_defines': 'target_arch=arm64',
},
+ 'asan': {
+ 'gn_args': 'is_asan=true',
+ 'gyp_defines': 'asan=1',
+ },
+
+ 'clang': {
+ 'gn_args': 'is_clang=true',
+ 'gyp_defines': 'clang=1',
+ },
+
'debug': {
'gn_args': 'is_debug=true',
},
@@ -103,10 +176,43 @@
'gyp_defines': 'chromium_ios_signing=0',
},
+ 'disable_nacl': {
kjellander_webrtc 2016/08/08 14:47:08 Remove disable_nacl since it won't have any effect
+ 'gn_args': 'enable_nacl=false',
+ 'gyp_defines': 'disable_nacl=1',
+ },
+
'gn': {'type': 'gn'},
'gyp': {'type': 'gyp'},
+ 'libfuzzer': { 'gn_args': 'use_libfuzzer=true' },
+
+ 'lsan': {
+ 'gn_args': 'is_lsan=true',
+ 'gyp_defines': 'lsan=1',
+ },
+
+ 'memcheck': {
+ 'gyp_defines': 'build_for_tool=memcheck',
+ },
+
+ 'msan': {
+ 'gn_args': ('is_msan=true msan_track_origins=2 '
+ 'use_prebuilt_instrumented_libraries=true'),
+ 'gyp_defines': ('msan=1 msan_track_origins=2 '
+ 'use_prebuilt_instrumented_libraries=1'),
+ },
+
+ 'tsan': {
+ 'gn_args': 'is_tsan=true',
+ 'gyp_defines': 'tsan=1',
+ },
+
+ 'openh264': {
+ 'gn_args': 'ffmpeg_branding="Chrome" rtc_use_h264=true',
+ 'gyp_defines': 'ffmpeg_branding=Chrome rtc_use_h264=1',
+ },
+
'release': {
'gn_args': 'is_debug=false',
},
@@ -125,6 +231,16 @@
'gyp_defines': 'component=static_library',
},
+ 'ubsan': {
+ 'gn_args': 'is_ubsan=true',
+ 'gyp_defines': 'ubsan=1',
+ },
+
+ 'ubsan_vptr': {
+ 'gn_args': 'is_ubsan_vptr=true',
+ 'gyp_defines': 'ubsan_vptr=1',
+ },
+
'x64': {
'gn_args': 'target_cpu="x64"',
'gyp_defines': 'target_arch=x64',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698