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

Unified Diff: scripts/slave/recipes/chromium.expected/dynamic_junit_test.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/dynamic_junit_test.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_junit_test.json b/scripts/slave/recipes/chromium.expected/dynamic_junit_test.json
index f4ed0cf7f2386a071b75378dfb2b83c75fd10f78..166af038d3cc5f0b9ff5e0193200e11f3b1d1bc2 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_junit_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_junit_test.json
@@ -328,6 +328,10 @@
"['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
"/path/to/tmp/json"
],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
"name": "List adb devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
@@ -344,6 +348,10 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"014E1F310401C009"
],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
"name": "Root devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -403,6 +411,10 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
"name": "Upload to test-results [base_junit_tests]"
},
{
@@ -412,6 +424,10 @@
"\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
"[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
"name": "test_report",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698