Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json |
index f6bd7436d4338d3dea068dae32edb74efde04bda..da2502f0edd9a703abc1dce08ce7e8f4b9684b44 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json |
@@ -237,7 +237,7 @@ |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb", |
"~/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"name": "create adb symlink" |
}, |
{ |
@@ -248,7 +248,7 @@ |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/out/logcat", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -264,7 +264,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -282,7 +282,7 @@ |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb", |
"-v" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -303,7 +303,7 @@ |
"-t", |
"Debug" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -326,7 +326,7 @@ |
"-v", |
"--overwrite-known-devices-files" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -443,7 +443,7 @@ |
"--blacklist-file", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/out/bad_devices.json" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"name": "spawn_device_monitor" |
}, |
{ |
@@ -457,7 +457,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -475,7 +475,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -493,7 +493,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -511,7 +511,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -529,7 +529,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -547,7 +547,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -565,7 +565,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -583,7 +583,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -601,7 +601,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -619,7 +619,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -637,7 +637,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -655,7 +655,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -673,7 +673,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/build/android:%(PATH)s" |
@@ -691,7 +691,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"name": "AppRTCDemoTest" |
}, |
{ |
@@ -705,7 +705,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"name": "libjingle_peerconnection_android_unittest" |
}, |
{ |
@@ -718,7 +718,7 @@ |
"--pid-file-path", |
"/tmp/device_monitor.pid" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"name": "shutdown_device_monitor" |
}, |
{ |
@@ -730,7 +730,7 @@ |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/out/Debug/full_log", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/out/logcat" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"name": "logcat_dump" |
}, |
{ |
@@ -749,7 +749,7 @@ |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/out/Debug/full_log", |
"gs://chromium-android/logcat_dumps/Android32 Tests (L Nexus7.2)(dbg)/1337" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"name": "gsutil upload", |
"~followup_annotations": [ |
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android32 Tests (L Nexus7.2)(dbg)/1337@@@" |
@@ -763,7 +763,7 @@ |
"--more-info", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/out/Debug/full_log" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/out/Debug", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
@@ -780,7 +780,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"env": { |
"CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/out/Debug", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
@@ -795,7 +795,7 @@ |
"\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", |
"[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src/out/Debug/test_logs/*.log" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_", |
+ "cwd": "[BUILDER_CACHE]/Android32_Tests__L_Nexus7_2__dbg_/src", |
"name": "test_report", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |