Index: scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json |
diff --git a/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json b/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json |
index 6490c70d3ae08938b8a2db8f1608350cf2355dc6..019215efafefc96573874f3a1aaed59adf85889b 100644 |
--- a/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json |
+++ b/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json |
@@ -1121,39 +1121,16 @@ |
}, |
{ |
"cmd": [ |
- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk", |
- "-v", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--release" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
- }, |
- "name": "install AndroidWebView.apk" |
- }, |
- { |
- "cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk", |
+ "[SLAVE_BUILD]/src/out/Release/bin/run_android_webview_test_apk", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--logcat-output-file", |
"/path/to/tmp/", |
- "--apk-under-test", |
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk", |
- "--isolate-file-path", |
- "android_webview/android_webview_test_apk.isolate", |
"--flakiness-dashboard-server", |
"test-results.appspot.com", |
"--verbose", |
- "--release", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
@@ -1165,39 +1142,16 @@ |
}, |
{ |
"cmd": [ |
- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
- "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.apk", |
- "-v", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--release" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
- }, |
- "name": "install ContentShell.apk" |
- }, |
- { |
- "cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.apk", |
+ "[SLAVE_BUILD]/src/out/Release/bin/run_content_shell_test_apk", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--logcat-output-file", |
"/path/to/tmp/", |
- "--apk-under-test", |
- "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.apk", |
- "--isolate-file-path", |
- "content/content_shell_test_apk.isolate", |
"--flakiness-dashboard-server", |
"test-results.appspot.com", |
"--verbose", |
- "--release", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
@@ -1209,43 +1163,16 @@ |
}, |
{ |
"cmd": [ |
- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk", |
- "-v", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--release" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
- }, |
- "name": "install ChromePublic.apk" |
- }, |
- { |
- "cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.apk", |
+ "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_public_test_apk", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--logcat-output-file", |
"/path/to/tmp/", |
- "--apk-under-test", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk", |
- "--additional-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTestSupport.apk", |
- "--additional-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromiumNetTestSupport.apk", |
- "--isolate-file-path", |
- "chrome/chrome_public_test_apk.isolate", |
"--flakiness-dashboard-server", |
"test-results.appspot.com", |
"--verbose", |
- "--release", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
@@ -1257,37 +1184,16 @@ |
}, |
{ |
"cmd": [ |
- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk", |
- "-v", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--release" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
- }, |
- "name": "install ChromeSyncShell.apk" |
- }, |
- { |
- "cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.apk", |
+ "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_sync_shell_test_apk", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--logcat-output-file", |
"/path/to/tmp/", |
- "--apk-under-test", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk", |
"--flakiness-dashboard-server", |
"test-results.appspot.com", |
"--verbose", |
- "--release", |
"--json-results-file", |
"/path/to/tmp/json" |
], |