| Index: scripts/slave/recipes/findit/chromium/test.expected/use_build_parameter_for_tests.json
|
| diff --git a/scripts/slave/recipes/findit/chromium/test.expected/use_build_parameter_for_tests.json b/scripts/slave/recipes/findit/chromium/test.expected/use_build_parameter_for_tests.json
|
| index 2511afd314110f25aed68973bffaf00a2d023fcc..1a005a34c10add14083bb6c47f0c631ddde97291 100644
|
| --- a/scripts/slave/recipes/findit/chromium/test.expected/use_build_parameter_for_tests.json
|
| +++ b/scripts/slave/recipes/findit/chromium/test.expected/use_build_parameter_for_tests.json
|
| @@ -727,6 +727,10 @@
|
| "--gtest_filter=Test.One",
|
| "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| "name": "test r2.[trigger] gl_tests (r2) on Mac-10.9",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -768,6 +772,10 @@
|
| "1",
|
| "gl_tests (r2)/Mac-10.9/[dummy has/mac_chromium_variable/1"
|
| ],
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| "name": "test r2.gl_tests (r2) on Mac-10.9",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@"
|
| @@ -793,6 +801,10 @@
|
| "--chrome-revision",
|
| "170242"
|
| ],
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| "name": "test r2.Upload to test-results [test r2.gl_tests (r2) on Mac-10.9]",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@"
|
| @@ -1262,6 +1274,10 @@
|
| "--gtest_filter=Test.One",
|
| "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| "name": "test r3.[trigger] gl_tests (r3) on Mac-10.9",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -1303,6 +1319,10 @@
|
| "1",
|
| "gl_tests (r3)/Mac-10.9/[dummy has/mac_chromium_variable/1"
|
| ],
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| "name": "test r3.gl_tests (r3) on Mac-10.9",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@"
|
| @@ -1328,6 +1348,10 @@
|
| "--chrome-revision",
|
| "170242"
|
| ],
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| "name": "test r3.Upload to test-results [test r3.gl_tests (r3) on Mac-10.9]",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@"
|
| @@ -1797,6 +1821,10 @@
|
| "--gtest_filter=Test.One",
|
| "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| "name": "test r4.[trigger] gl_tests (r4) on Mac-10.9",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -1838,6 +1866,10 @@
|
| "1",
|
| "gl_tests (r4)/Mac-10.9/[dummy has/mac_chromium_variable/1"
|
| ],
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| "name": "test r4.gl_tests (r4) on Mac-10.9",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -1866,6 +1898,10 @@
|
| "--chrome-revision",
|
| "170242"
|
| ],
|
| + "env": {
|
| + "FORCE_MAC_TOOLCHAIN": "1",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| "name": "test r4.Upload to test-results [test r4.gl_tests (r4) on Mac-10.9]",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@"
|
|
|