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

Unified Diff: scripts/slave/recipes/findit/chromium/test.expected/swarming_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/findit/chromium/test.expected/swarming_tests.json
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json b/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json
index 97407adb40dd467a3a77c0639ef43ec7b0bcc49c..5d61ac6590f7a714c85860f53fa7dc16c77b9a9e 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json
@@ -703,6 +703,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 r1.[trigger] gl_tests (r1) on Mac-10.9",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -744,6 +748,10 @@
"1",
"gl_tests (r1)/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 r1.gl_tests (r1) on Mac-10.9",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -769,6 +777,10 @@
"--chrome-revision",
"170242"
],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
"name": "test r1.Upload to test-results [test r1.gl_tests (r1) on Mac-10.9]",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"

Powered by Google App Engine
This is Rietveld 408576698