| Index: scripts/slave/recipe_modules/chromium/chromium_memory_fyi.py
|
| diff --git a/scripts/slave/recipe_modules/chromium/chromium_memory_fyi.py b/scripts/slave/recipe_modules/chromium/chromium_memory_fyi.py
|
| index d9cbb0bd044e25c4de84ea8579b5877a2ec13a0d..5f026b0f7e2612336c31556ade2068c75f677a58 100644
|
| --- a/scripts/slave/recipe_modules/chromium/chromium_memory_fyi.py
|
| +++ b/scripts/slave/recipe_modules/chromium/chromium_memory_fyi.py
|
| @@ -10,12 +10,10 @@ SPEC = {
|
| },
|
| 'builders': {
|
| 'Chromium Linux MSan Builder': {
|
| - 'recipe_config': 'chromium_clang',
|
| + 'recipe_config': 'chromium_msan',
|
| + 'chromium_apply_config': ['instrumented_libraries'],
|
| 'GYP_DEFINES': {
|
| - 'msan': 1,
|
| 'msan_track_origins': 0,
|
| - 'use_instrumented_libraries': 1,
|
| - 'instrumented_libraries_jobs': 10,
|
| },
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -27,12 +25,7 @@ SPEC = {
|
| },
|
| },
|
| 'Linux MSan Tests': {
|
| - 'recipe_config': 'chromium_clang',
|
| - 'GYP_DEFINES': {
|
| - # Required on testers to pass the right runtime flags.
|
| - # TODO(earthdok): make this part of a chromium_msan recipe config.
|
| - 'msan': 1,
|
| - },
|
| + 'recipe_config': 'chromium_msan',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -47,12 +40,7 @@ SPEC = {
|
| },
|
| },
|
| 'Linux MSan Browser (1)': {
|
| - 'recipe_config': 'chromium_clang',
|
| - 'GYP_DEFINES': {
|
| - # Required on testers to pass the right runtime flags.
|
| - # TODO(earthdok): make this part of a chromium_msan recipe config.
|
| - 'msan': 1,
|
| - },
|
| + 'recipe_config': 'chromium_msan',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -67,12 +55,7 @@ SPEC = {
|
| },
|
| },
|
| 'Linux MSan Browser (2)': {
|
| - 'recipe_config': 'chromium_clang',
|
| - 'GYP_DEFINES': {
|
| - # Required on testers to pass the right runtime flags.
|
| - # TODO(earthdok): make this part of a chromium_msan recipe config.
|
| - 'msan': 1,
|
| - },
|
| + 'recipe_config': 'chromium_msan',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -87,12 +70,7 @@ SPEC = {
|
| },
|
| },
|
| 'Linux MSan Browser (3)': {
|
| - 'recipe_config': 'chromium_clang',
|
| - 'GYP_DEFINES': {
|
| - # Required on testers to pass the right runtime flags.
|
| - # TODO(earthdok): make this part of a chromium_msan recipe config.
|
| - 'msan': 1,
|
| - },
|
| + 'recipe_config': 'chromium_msan',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
|
|