Index: webrtc/build/mb_config.pyl |
diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl |
index c990fc3e65fbfbcb756e6df485e7bdc4c1a68675..2dcc1ddb02b6bd8715d9f77711584e0c000cd7d5 100644 |
--- a/webrtc/build/mb_config.pyl |
+++ b/webrtc/build/mb_config.pyl |
@@ -62,6 +62,22 @@ |
'Android32 Tests (L Nexus7.2)(dbg)': 'none', |
'Android32 Tests (L Nexus7.2)': 'none', |
'Android64 Tests (L Nexus9)': 'none', |
+ |
+ # Windows |
+ 'Win32 Debug': 'gyp_debug_bot_x86', |
+ 'Win32 Release': 'gyp_release_bot_x86', |
+ 'Win64 Debug': 'gyp_debug_bot_x64', |
+ 'Win64 Release': 'gyp_release_bot_x64', |
+ 'Win64 Debug (GN)': 'gn_debug_bot_x64', |
+ 'Win64 Release (GN)': 'gn_release_bot_x64', |
+ 'Win32 Debug (Clang)': 'win_gyp_clang_debug_bot_x86', |
+ 'Win32 Release (Clang)': 'win_gyp_clang_release_bot_x86', |
+ 'Win64 Debug (Clang)': 'win_gyp_clang_debug_bot_x64', |
+ 'Win64 Release (Clang)': 'win_gyp_clang_release_bot_x64', |
+ 'Win SyzyASan': 'win_gyp_syzyasan_release_bot_x86', |
+ 'Win DrMemory Full': 'win_gyp_drmemory_debug_bot_x86', |
+ 'Win DrMemory Light': 'win_gyp_drmemory_debug_bot_x86', |
+ 'Win32 Release [large tests]': 'gyp_release_bot_x86', |
}, |
'tryserver.webrtc': { |
# iOS |
@@ -107,6 +123,27 @@ |
'android_n6': 'android_gyp_debug_static_bot_arm', |
'android_gn_dbg': 'android_gn_debug_static_bot_arm', |
'android_gn_rel': 'android_gn_release_bot_arm', |
+ |
+ # Windows |
+ 'win_compile_dbg': 'gyp_debug_bot_x86', |
+ 'win_compile_rel': 'gyp_release_bot_x86', |
+ 'win_compile_x64_dbg': 'gyp_debug_bot_x64', |
+ 'win_compile_x64_rel': 'gyp_release_bot_x64', |
+ 'win_dbg': 'gyp_debug_bot_x86', |
+ 'win_rel': 'gyp_release_bot_x86', |
+ 'win_x64_dbg': 'gyp_debug_bot_x64', |
+ 'win_x64_rel': 'gyp_release_bot_x64', |
+ 'win_x64_gn_dbg': 'gn_debug_bot_x64', |
+ 'win_x64_gn_rel': 'gn_release_bot_x64', |
+ 'win_clang_dbg': 'win_gyp_clang_debug_bot_x86', |
+ 'win_clang_rel': 'win_gyp_clang_release_bot_x86', |
+ 'win_x64_clang_dbg': 'win_gyp_clang_debug_bot_x64', |
+ 'win_x64_clang_rel': 'win_gyp_clang_release_bot_x64', |
+ 'win_asan': 'win_gyp_syzyasan_release_bot_x86', |
+ 'win_drmemory_light': 'win_gyp_drmemory_debug_bot_x86', |
+ 'win_drmemory_full': 'win_gyp_drmemory_debug_bot_x86', |
+ 'win_baremetal': 'gyp_release_bot_x86', |
+ 'win_swarming': 'swarming_gyp_debug_bot_x64', |
}, |
}, |
@@ -142,7 +179,7 @@ |
'ios', 'gyp', 'ios_release_bot', 'x64' |
], |
- # Linux |
+ # Linux, Mac and Windows |
'gyp_crosscompile_release_bot_arm': [ |
'gyp', 'crosscompile', 'openh264_release_bot', 'arm' |
], |
@@ -186,6 +223,28 @@ |
'swarming', 'gyp', 'openh264_debug_bot', 'x64' |
], |
+ # Windows |
+ 'win_gyp_clang_debug_bot_x86': [ |
+ 'gyp', 'clang', 'openh264_debug_bot', 'x86', |
+ ], |
+ 'win_gyp_clang_release_bot_x86': [ |
+ 'gyp', 'clang', 'openh264_release_bot', 'x86', |
+ ], |
+ 'win_gyp_clang_debug_bot_x64': [ |
+ 'gyp', 'clang', 'openh264_debug_bot', 'x64', |
+ ], |
+ 'win_gyp_clang_release_bot_x64': [ |
+ 'gyp', 'clang', 'openh264_release_bot', 'x64', |
+ ], |
+ 'win_gyp_syzyasan_release_bot_x86': [ |
+ 'gyp', 'syzyasan', 'minimal_symbols', 'openh264_release_bot', 'x86', |
+ ], |
+ # TODO(kjellander): Flip DrMemory bots over to Release after GN migration |
+ # (http://crbug.com/636414). |
+ 'win_gyp_drmemory_debug_bot_x86': [ |
+ 'gyp', 'drmemory', 'minimal_symbols', 'openh264_debug_bot', 'x86', |
+ ], |
+ |
# Android |
'android_gyp_debug_static_bot_arm': [ |
'android', 'gyp', 'debug_static_bot', 'arm' |
@@ -286,6 +345,11 @@ |
'gyp_defines': 'chromium_ios_signing=0', |
}, |
+ 'drmemory': { |
+ 'gn_args': 'is_component_build=true enable_iterator_debugging=false', |
+ 'gyp_defines': 'component=shared_library build_for_tool=drmemory', |
+ }, |
+ |
# This mixin is used to force configs that use it to fail. It |
# is used in two cases: when we have bots that we haven't looked |
# at yet and don't know whether they need MB or not, and for bots |
@@ -338,6 +402,11 @@ |
'gyp_defines': 'target_arch=mipsel', |
}, |
+ 'minimal_symbols': { |
+ 'gn_args': 'symbol_level=1', |
+ 'gyp_defines': 'fastbuild=1', |
+ }, |
+ |
'msan': { |
'gn_args': ('is_msan=true msan_track_origins=2 ' |
'use_prebuilt_instrumented_libraries=true'), |
@@ -381,6 +450,11 @@ |
'gyp_defines': 'test_isolation_mode=prepare', |
}, |
+ 'syzyasan': { |
+ 'gn_args': 'is_syzyasan=true', |
+ 'gyp_defines': 'syzyasan=1' |
+ }, |
+ |
'tsan': { |
'gn_args': 'is_tsan=true', |
'gyp_defines': 'tsan=1', |