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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac_GN__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_Mac_GN__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac_GN__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac_GN__dbg_.json
index e22cd580ed32fa6a5229ba2ee79e9afbcba525b4..cb4748f837477c06d4dbede45256017c7f534e3b 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac_GN__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac_GN__dbg_.json
@@ -398,6 +398,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@{@@@",
@@ -415,6 +419,10 @@
"\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
"browser_tests"
],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
"name": "[error] browser_tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -431,6 +439,10 @@
"\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
"browser_tests"
],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
"name": "[collect error] browser_tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698