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

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json

Issue 1930433002: Roll recipe dependencies (nontrivial). (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Rebase Created 4 years, 8 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/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json
index 8270ee8097c40db6ee5df2d92ab764d150d2541a..97aaea40f98c32e4cac6879a8afa7839eb3d5234 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2_.json
@@ -24,7 +24,6 @@
"src@12345",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -63,7 +62,6 @@
"RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
"[SLAVE_BUILD]/src/out"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean test output files"
},
{
@@ -76,7 +74,6 @@
"[SLAVE_BUILD]/src/out/build_product.zip",
"[SLAVE_BUILD]/src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean local files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -101,7 +98,6 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CROSSCOMPILE": "1",
@@ -117,7 +113,6 @@
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[SLAVE_BUILD]/src/out/Release"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree build directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -149,7 +144,6 @@
"--build-number",
"1337"
],
- "cwd": "[SLAVE_BUILD]",
"name": "extract build"
},
{
@@ -161,7 +155,6 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
- "cwd": "[SLAVE_BUILD]",
"name": "create adb symlink"
},
{
@@ -171,7 +164,6 @@
"[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
"[SLAVE_BUILD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -187,7 +179,6 @@
"--adb-path",
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -204,7 +195,6 @@
"--known-devices-file",
"[BUILD]/site_config/.known_devices"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -317,7 +307,6 @@
"--output-device-blacklist",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -342,7 +331,6 @@
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
@@ -356,7 +344,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -374,7 +361,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -392,7 +378,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -410,7 +395,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -428,7 +412,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -446,7 +429,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -464,7 +446,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -482,7 +463,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -500,7 +480,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -518,7 +497,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -536,7 +514,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -554,7 +531,6 @@
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -598,7 +574,6 @@
"-t",
"2700"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUT_DIR": "[SLAVE_BUILD]/src/out/Release"
},
@@ -613,7 +588,6 @@
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test AppRTCDemoTest"
},
{
@@ -625,7 +599,6 @@
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test libjingle_peerconnection_android_unittest"
},
{
@@ -638,7 +611,6 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
- "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
@@ -650,7 +622,6 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"[SLAVE_BUILD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -669,7 +640,6 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"gs://chromium-android/logcat_dumps/Android32 Tests (L Nexus7.2)/1337"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android32 Tests (L Nexus7.2)/1337@@@"
@@ -683,7 +653,6 @@
"--more-info",
"[SLAVE_BUILD]/src/out/Release/full_log"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -698,7 +667,6 @@
"-s",
"-w"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -713,7 +681,6 @@
"\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"
],
- "cwd": "[SLAVE_BUILD]",
"name": "test_report",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698