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

Unified Diff: scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.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/findit_steps_multiple_culprits.json
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
index 55412a2189662019891a897ea32d3c471d013704..5762b394282349d6aeb854a8556038f2085a9d95 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
@@ -719,6 +719,10 @@
"--gtest_filter=Test.gl_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 r5.[trigger] gl_tests (r5) on Mac-10.9",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -800,6 +804,10 @@
"--gtest_filter=Test.browser_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 r5.[trigger] browser_tests (r5) on Mac-10.9",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -841,6 +849,10 @@
"1",
"gl_tests (r5)/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 r5.gl_tests (r5) on Mac-10.9",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -869,6 +881,10 @@
"--chrome-revision",
"170242"
],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
"name": "test r5.Upload to test-results [test r5.gl_tests (r5) on Mac-10.9]",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -898,6 +914,10 @@
"1",
"browser_tests (r5)/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 r5.browser_tests (r5) on Mac-10.9",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -923,6 +943,10 @@
"--chrome-revision",
"170242"
],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
"name": "test r5.Upload to test-results [test r5.browser_tests (r5) on Mac-10.9]",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -1398,6 +1422,10 @@
"--gtest_filter=Test.browser_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 r6.[trigger] browser_tests (r6) on Mac-10.9",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -1439,6 +1467,10 @@
"1",
"browser_tests (r6)/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 r6.browser_tests (r6) on Mac-10.9",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -1467,6 +1499,10 @@
"--chrome-revision",
"170242"
],
+ "env": {
+ "FORCE_MAC_TOOLCHAIN": "1",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
"name": "test r6.Upload to test-results [test r6.browser_tests (r6) on Mac-10.9]",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -1942,6 +1978,10 @@
"--gtest_filter=Test.gl_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@@@",
@@ -1983,6 +2023,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@@@"
@@ -2008,6 +2052,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@@@"
@@ -2483,6 +2531,10 @@
"--gtest_filter=Test.gl_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@@@",
@@ -2524,6 +2576,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@@@",
@@ -2552,6 +2608,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@@@"

Powered by Google App Engine
This is Rietveld 408576698