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

Unified Diff: scripts/slave/recipe_modules/chromium_tests/chromium_mac.py

Issue 1942383002: Enable hermetic builds for FYI mac builders. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 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
Index: scripts/slave/recipe_modules/chromium_tests/chromium_mac.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py b/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py
index f4d66614bcd321789c9ea45d57d6318b8caf13b5..7053f170cc1fe54b8d50e367f044d8b715ac74e4 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py
@@ -20,6 +20,7 @@ SPEC = {
'chrome_with_codecs',
'mb',
'ninja_confirm_noop',
+ 'force_mac_toolchain',
erikchen 2016/05/03 16:48:57 To start, let's move all the FYI bots over first,
justincohen 2016/05/03 17:32:58 done, reverted.
],
'gclient_config': 'chromium',
'chromium_config_kwargs': {
@@ -38,7 +39,7 @@ SPEC = {
},
'Mac10.9 Tests': {
'chromium_config': 'chromium',
- 'chromium_apply_config': ['ninja_confirm_noop'],
+ 'chromium_apply_config': ['ninja_confirm_noop', 'force_mac_toolchain'],
'gclient_config': 'chromium',
'chromium_config_kwargs': {
'BUILD_CONFIG': 'Release',
@@ -61,7 +62,7 @@ SPEC = {
},
'Mac10.10 Tests': {
'chromium_config': 'chromium',
- 'chromium_apply_config': ['ninja_confirm_noop'],
+ 'chromium_apply_config': ['ninja_confirm_noop', 'force_mac_toolchain'],
'gclient_config': 'chromium',
'chromium_config_kwargs': {
'BUILD_CONFIG': 'Release',
@@ -83,7 +84,7 @@ SPEC = {
},
'Mac10.11 Tests': {
'chromium_config': 'chromium',
- 'chromium_apply_config': ['ninja_confirm_noop'],
+ 'chromium_apply_config': ['ninja_confirm_noop', 'force_mac_toolchain'],
'gclient_config': 'chromium',
'chromium_config_kwargs': {
'BUILD_CONFIG': 'Release',
@@ -102,7 +103,7 @@ SPEC = {
},
'Mac GN': {
'chromium_config': 'chromium',
- 'chromium_apply_config': ['mb'],
+ 'chromium_apply_config': ['mb', 'force_mac_toolchain'],
'gclient_config': 'chromium',
'chromium_config_kwargs': {
'BUILD_CONFIG': 'Release',
@@ -120,7 +121,11 @@ SPEC = {
},
'Mac Builder (dbg)': {
'chromium_config': 'chromium',
- 'chromium_apply_config': ['mb', 'ninja_confirm_noop'],
+ 'chromium_apply_config': [
+ 'mb',
+ 'ninja_confirm_noop',
+ 'force_mac_toolchain'
+ ],
'gclient_config': 'chromium',
'chromium_config_kwargs': {
'BUILD_CONFIG': 'Debug',
@@ -138,7 +143,7 @@ SPEC = {
},
'Mac10.9 Tests (dbg)': {
'chromium_config': 'chromium',
- 'chromium_apply_config': ['ninja_confirm_noop'],
+ 'chromium_apply_config': ['ninja_confirm_noop', 'force_mac_toolchain'],
'gclient_config': 'chromium',
'chromium_config_kwargs': {
'BUILD_CONFIG': 'Debug',
@@ -161,7 +166,7 @@ SPEC = {
},
'Mac GN (dbg)': {
'chromium_config': 'chromium',
- 'chromium_apply_config': ['mb'],
+ 'chromium_apply_config': ['mb', 'force_mac_toolchain'],
'gclient_config': 'chromium',
'chromium_config_kwargs': {
'BUILD_CONFIG': 'Debug',

Powered by Google App Engine
This is Rietveld 408576698