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

Unified Diff: scripts/slave/recipes/chromium.expected/full_client_skia_Mac10_9_Tests.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_client_skia_Mac10_9_Tests.json
diff --git a/scripts/slave/recipes/chromium.expected/full_client_skia_Mac10_9_Tests.json b/scripts/slave/recipes/chromium.expected/full_client_skia_Mac10_9_Tests.json
index d7884134381e7d72219f62a1ae40b4bca1780caf..6126833c99b60ea54b0000e0022c159f5d97b317 100644
--- a/scripts/slave/recipes/chromium.expected/full_client_skia_Mac10_9_Tests.json
+++ b/scripts/slave/recipes/chromium.expected/full_client_skia_Mac10_9_Tests.json
@@ -305,6 +305,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@{@@@",
@@ -378,6 +382,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@{@@@",
@@ -418,6 +426,10 @@
"1",
"browser_tests/Mac-10.9/ffffffffff/Mac10.9 Tests/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@@@"
@@ -443,6 +455,10 @@
"--chrome-revision",
"143121"
],
+ "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