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

Unified Diff: scripts/slave/recipes/findit/chromium/test.expected/use_build_parameter_for_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
« no previous file with comments | « scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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@@@"
« no previous file with comments | « scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698