Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json |
index 1cae7ba1170838cf64c7aecca3dd8ef3ba43bd3e..226c1ab144df9560e59e7b858148ee6174b23d55 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json |
@@ -256,7 +256,7 @@ |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb", |
"~/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "create adb symlink" |
}, |
{ |
@@ -267,7 +267,7 @@ |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/out/logcat", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -283,7 +283,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -301,7 +301,7 @@ |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb", |
"-v" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -322,7 +322,7 @@ |
"-t", |
"Release" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -345,7 +345,7 @@ |
"-v", |
"--overwrite-known-devices-files" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -451,13 +451,13 @@ |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/tools/clang/scripts/update.py", |
"--print-clang-version" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "get_clang_version", |
"stdout": "/path/to/tmp/" |
}, |
{ |
"cmd": [], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "Set up ASAN on devices" |
}, |
{ |
@@ -468,7 +468,7 @@ |
"['[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']", |
"/path/to/tmp/json" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "Set up ASAN on devices.List adb devices", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
@@ -486,7 +486,7 @@ |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb", |
"014E1F310401C009" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "Set up ASAN on devices.Root devices", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
@@ -510,7 +510,7 @@ |
"--device", |
"07a00ca4" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"ADB": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
@@ -537,7 +537,7 @@ |
"--blacklist-file", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/out/bad_devices.json" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "spawn_device_monitor" |
}, |
{ |
@@ -552,7 +552,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -571,7 +571,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -590,7 +590,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -609,7 +609,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -628,7 +628,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -647,7 +647,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -666,7 +666,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -685,7 +685,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -704,7 +704,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -723,7 +723,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -742,7 +742,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -761,7 +761,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -780,7 +780,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"PATH": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/build/android:%(PATH)s" |
@@ -799,7 +799,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "AppRTCDemoTest" |
}, |
{ |
@@ -814,7 +814,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "libjingle_peerconnection_android_unittest" |
}, |
{ |
@@ -827,7 +827,7 @@ |
"--pid-file-path", |
"/tmp/device_monitor.pid" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "shutdown_device_monitor" |
}, |
{ |
@@ -839,7 +839,7 @@ |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/out/Release/full_log", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/out/logcat" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "logcat_dump" |
}, |
{ |
@@ -858,7 +858,7 @@ |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/out/Release/full_log", |
"gs://chromium-android/logcat_dumps/Android32 ASan (L Nexus6)/1337" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "gsutil upload", |
"~followup_annotations": [ |
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android32 ASan (L Nexus6)/1337@@@" |
@@ -872,7 +872,7 @@ |
"--more-info", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/out/Release/full_log" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/out/Release", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
@@ -889,7 +889,7 @@ |
"--adb-path", |
"[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"env": { |
"CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src/out/Release", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
@@ -904,7 +904,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_ASan__L_Nexus6_/src/out/Release/test_logs/*.log" |
], |
- "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_", |
+ "cwd": "[BUILDER_CACHE]/Android32_ASan__L_Nexus6_/src", |
"name": "test_report", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |