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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests__dbg_.json

Issue 2014373002: chromium_tests: apply chromium.get_env() when running tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 7 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/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests__dbg_.json
index 921736298aea9828973e9dd6f67eff2e728e17cc..e9600692eb2f95217a9c1c776b1b1a0331c4cea2 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests__dbg_.json
@@ -294,6 +294,10 @@
"--output-json",
"/path/to/tmp/json"
],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
"name": "find isolated tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -367,6 +371,10 @@
"--",
"--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": "[trigger] browser_tests on Mac-10.9",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -407,6 +415,10 @@
"1",
"browser_tests/Mac-10.9/ffffffffff/Mac10.9 Tests (dbg)/571"
],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
"name": "browser_tests on Mac-10.9",
"~followup_annotations": [
"@@@STEP_LINK@shard #0 isolated out@blah@@@"
@@ -432,6 +444,10 @@
"--chrome-revision",
"170242"
],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
"name": "Upload to test-results [browser_tests on Mac-10.9]"
},
{

Powered by Google App Engine
This is Rietveld 408576698