| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11_Force_Mac_Toolchain.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11_Force_Mac_Toolchain.json
|
| similarity index 96%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11_Force_Mac_Toolchain.json
|
| index e29b70e20ddf7c0f4eb056ef60c8164539c2377f..f73adaf26ff53d323b79ff10041840f2a3156a30 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11_Force_Mac_Toolchain.json
|
| @@ -7,7 +7,7 @@
|
| "--master",
|
| "chromium.fyi",
|
| "--builder",
|
| - "Chromium Mac 10.11",
|
| + "Chromium Mac 10.11 Force Mac Toolchain",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -106,6 +106,7 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -124,7 +125,7 @@
|
| "--paths",
|
| "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Chromium Mac 10.11\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
|
| + "{\"buildername\": \"Chromium Mac 10.11 Force Mac Toolchain\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| @@ -173,6 +174,9 @@
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1"
|
| + },
|
| "name": "clang_revision",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -210,6 +214,9 @@
|
| "chromium_builder_tests"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1"
|
| + },
|
| "name": "compile",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
|
|