Index: scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json |
diff --git a/scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json b/scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json |
index b67eca08fc8c4e7d3dd1260dd88eb46cffd56764..875e4f0de441331834b70f9d13e67ec594c6a4e4 100644 |
--- a/scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json |
+++ b/scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json |
@@ -1334,178 +1334,88 @@ |
}, |
{ |
"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", |
+ "out/Release/bin/run_android_webview_test_apk", |
"instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.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" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "Instrumentation test AndroidWebViewTest (with patch)", |
+ "name": "Instrumentation test android_webview_test_apk (with patch)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
}, |
{ |
"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", |
+ "out/Release/bin/run_content_shell_test_apk", |
"instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.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" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "Instrumentation test ContentShellTest (with patch)", |
+ "name": "Instrumentation test content_shell_test_apk (with patch)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
}, |
{ |
"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", |
+ "out/Release/bin/run_chrome_public_test_apk", |
"instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.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" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "Instrumentation test ChromePublicTest (with patch)", |
+ "name": "Instrumentation test chrome_public_test_apk (with patch)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
}, |
{ |
"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", |
+ "out/Release/bin/run_chrome_sync_shell_test_apk", |
"instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.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" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "Instrumentation test ChromeSyncShellTest (with patch)", |
+ "name": "Instrumentation test chrome_sync_shell_test_apk (with patch)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
@@ -2563,178 +2473,88 @@ |
}, |
{ |
"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 (2)" |
- }, |
- { |
- "cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "out/Release/bin/run_android_webview_test_apk", |
"instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.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" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "Instrumentation test AndroidWebViewTest (without patch)", |
+ "name": "Instrumentation test android_webview_test_apk (without patch)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
}, |
{ |
"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 (2)" |
- }, |
- { |
- "cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "out/Release/bin/run_content_shell_test_apk", |
"instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.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" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "Instrumentation test ContentShellTest (without patch)", |
+ "name": "Instrumentation test content_shell_test_apk (without patch)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
}, |
{ |
"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 (2)" |
- }, |
- { |
- "cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "out/Release/bin/run_chrome_public_test_apk", |
"instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.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" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "Instrumentation test ChromePublicTest (without patch)", |
+ "name": "Instrumentation test chrome_public_test_apk (without patch)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
}, |
{ |
"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 (2)" |
- }, |
- { |
- "cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "out/Release/bin/run_chrome_sync_shell_test_apk", |
"instrumentation", |
- "--test-apk", |
- "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.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" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "Instrumentation test ChromeSyncShellTest (without patch)", |
+ "name": "Instrumentation test chrome_sync_shell_test_apk (without patch)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
@@ -2812,7 +2632,7 @@ |
"import sys; sys.exit(0)" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "AndroidWebViewTest (retry summary)", |
+ "name": "android_webview_test_apk (retry summary)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@", |
"@@@STEP_WARNINGS@@@" |
@@ -2825,7 +2645,7 @@ |
"import sys; sys.exit(0)" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "ContentShellTest (retry summary)", |
+ "name": "content_shell_test_apk (retry summary)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@", |
"@@@STEP_WARNINGS@@@" |
@@ -2838,7 +2658,7 @@ |
"import sys; sys.exit(0)" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "ChromePublicTest (retry summary)", |
+ "name": "chrome_public_test_apk (retry summary)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@", |
"@@@STEP_WARNINGS@@@" |
@@ -2851,7 +2671,7 @@ |
"import sys; sys.exit(0)" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "ChromeSyncShellTest (retry summary)", |
+ "name": "chrome_sync_shell_test_apk (retry summary)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@", |
"@@@STEP_WARNINGS@@@" |