| Index: scripts/slave/recipe_modules/chromium_tests/chromium_webkit.py
|
| diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_webkit.py b/scripts/slave/recipe_modules/chromium_tests/chromium_webkit.py
|
| index 796ac960d8ffbd79bc30bcc9578a3b778b193f4d..9cfd8f165c1ab5a03ffe7e30d292c26350aaee85 100644
|
| --- a/scripts/slave/recipe_modules/chromium_tests/chromium_webkit.py
|
| +++ b/scripts/slave/recipe_modules/chromium_tests/chromium_webkit.py
|
| @@ -17,6 +17,7 @@ SPEC['settings']['src_side_runtest_py'] = False
|
| SPEC['builders'].update({
|
| 'WebKit Win Builder': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -37,6 +38,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit XP': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -60,6 +62,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Win7': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -83,6 +86,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Win10': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -106,8 +110,8 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Win x64 Builder': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| - 'chromium_apply_config': ['shared_library'],
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -134,6 +138,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Win Builder (dbg)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -154,6 +159,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Win7 (dbg)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -177,6 +183,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Win x64 Builder (dbg)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -204,6 +211,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac Builder': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -219,6 +227,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac10.6': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -242,6 +251,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac10.7': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -265,6 +275,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac10.8': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -288,6 +299,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac10.9 (retina)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -312,6 +324,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac10.9': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -335,6 +348,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac10.10': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -358,6 +372,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac Builder (dbg)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -373,6 +388,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac10.7 (dbg)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -396,7 +412,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux': {
|
| 'chromium_config': 'chromium',
|
| - 'chromium_apply_config': ['ninja_confirm_noop'],
|
| + 'chromium_apply_config': ['mb', 'ninja_confirm_noop'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -421,6 +437,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux Trusty': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -445,6 +462,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux 32': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -466,8 +484,8 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux ASAN': {
|
| 'chromium_config': 'chromium_clang',
|
| + 'chromium_apply_config': ['asan', 'mb'],
|
| 'gclient_config': 'chromium',
|
| - 'chromium_apply_config': ['asan'],
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -496,9 +514,10 @@ SPEC['builders'].update({
|
| 'chromium_config': 'chromium_clang',
|
| 'gclient_config': 'chromium',
|
| 'chromium_apply_config': [
|
| - 'prebuilt_instrumented_libraries',
|
| + 'mb',
|
| 'msan',
|
| 'msan_full_origin_tracking',
|
| + 'prebuilt_instrumented_libraries',
|
| ],
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -527,6 +546,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux (dbg)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -548,6 +568,7 @@ SPEC['builders'].update({
|
| },
|
| 'Android Builder': {
|
| 'chromium_config': 'android',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['android', 'blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -563,6 +584,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Android (Nexus4)': {
|
| 'chromium_config': 'android',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['android', 'blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -589,6 +611,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Win Oilpan': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_apply_config': ['oilpan'],
|
| @@ -619,9 +642,9 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Win Oilpan (dbg)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb', 'oilpan'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| - 'chromium_apply_config': ['oilpan'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 32,
|
| @@ -649,9 +672,9 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac Oilpan': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb', 'oilpan'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| - 'chromium_apply_config': ['oilpan'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -674,9 +697,9 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Mac Oilpan (dbg)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb', 'oilpan'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| - 'chromium_apply_config': ['oilpan'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| @@ -699,9 +722,9 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux Oilpan': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb', 'oilpan'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| - 'chromium_apply_config': ['oilpan'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -727,9 +750,9 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux Oilpan ASAN': {
|
| 'chromium_config': 'chromium_clang',
|
| + 'chromium_apply_config': ['asan', 'mb', 'oilpan'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| - 'chromium_apply_config': ['oilpan', 'asan'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -758,6 +781,7 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux Leak': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| 'chromium_config_kwargs': {
|
| @@ -786,9 +810,9 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux Oilpan Leak': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb', 'oilpan'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| - 'chromium_apply_config': ['oilpan'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -819,9 +843,9 @@ SPEC['builders'].update({
|
| },
|
| 'WebKit Linux Oilpan (dbg)': {
|
| 'chromium_config': 'chromium',
|
| + 'chromium_apply_config': ['mb', 'oilpan'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['blink_or_chromium'],
|
| - 'chromium_apply_config': ['oilpan'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
|
|