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

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json

Issue 1679703004: Remove build-side specification of instrumentation tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rerun expectations. Created 4 years, 10 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/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json
index b27c9d000f9653612bdb8965d82ca2b90e4d0e66..24ff77c717b08fea957a7699dd105221eb86ff8b 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json
@@ -228,54 +228,38 @@
"@@@STEP_LOG_LINE@analyze_details@ \"system_webview_apk\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"android_webview_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"base_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chrome_junit_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chrome_public_test_apk\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chrome_sync_shell_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"components_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_junit_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"content_shell_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"cronet_test_instrumentation_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"junit_unit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"net_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"system_webview_apk\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"android_webview_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"base_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chrome_junit_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chrome_public_test_apk\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chrome_sync_shell_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"components_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_junit_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"content_shell_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"cronet_test_instrumentation_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"junit_unit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"net_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"system_webview_apk\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"android_webview_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"base_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chrome_junit_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chrome_public_test_apk\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chrome_sync_shell_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"components_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_junit_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"content_shell_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"junit_unit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"net_junit_tests\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"android_webview_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"base_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chrome_junit_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chrome_public_test_apk\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chrome_sync_shell_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"components_junit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_junit_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"content_shell_test_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"junit_unit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"net_junit_tests\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ]@@@",
@@ -350,14 +334,10 @@
"--goma-fail-fast",
"--goma-disable-local-fallback",
"--",
- "android_webview_test_apk",
"base_junit_tests",
"chrome_junit_tests",
- "chrome_public_test_apk",
- "chrome_sync_shell_test_apk",
"components_junit_tests",
"content_junit_tests",
- "content_shell_test_apk",
"cronet_test_instrumentation_apk",
"junit_unit_tests",
"net_junit_tests",
@@ -552,176 +532,6 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
- "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebView.apk",
- "-v",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "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/Debug/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/Debug/apks/AndroidWebView.apk",
- "--isolate-file-path",
- "android_webview/android_webview_test_apk.isolate",
- "--flakiness-dashboard-server",
- "test-results.appspot.com",
- "--verbose",
- "--json-results-file",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test AndroidWebViewTest (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/Debug/apks/ChromePublic.apk",
- "-v",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "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/Debug/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/Debug/apks/ChromePublic.apk",
- "--additional-apk",
- "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublicTestSupport.apk",
- "--additional-apk",
- "[SLAVE_BUILD]/src/out/Debug/apks/ChromiumNetTestSupport.apk",
- "--isolate-file-path",
- "chrome/chrome_public_test_apk.isolate",
- "--flakiness-dashboard-server",
- "test-results.appspot.com",
- "--verbose",
- "--json-results-file",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test ChromePublicTest (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/Debug/apks/ContentShell.apk",
- "-v",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "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/Debug/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/Debug/apks/ContentShell.apk",
- "--isolate-file-path",
- "content/content_shell_test_apk.isolate",
- "--flakiness-dashboard-server",
- "test-results.appspot.com",
- "--verbose",
- "--json-results-file",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test ContentShellTest (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/Debug/apks/ChromeSyncShell.apk",
- "-v",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "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/Debug/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/Debug/apks/ChromeSyncShell.apk",
- "--flakiness-dashboard-server",
- "test-results.appspot.com",
- "--verbose",
- "--json-results-file",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test ChromeSyncShellTest (with patch)",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
- ]
- },
- {
- "cmd": [
"python",
"-u",
"[SLAVE_BUILD]/src/build/android/test_runner.py",
@@ -969,14 +779,10 @@
"--goma-fail-fast",
"--goma-disable-local-fallback",
"--",
- "android_webview_test_apk",
"base_junit_tests",
"chrome_junit_tests",
- "chrome_public_test_apk",
- "chrome_sync_shell_test_apk",
"components_junit_tests",
"content_junit_tests",
- "content_shell_test_apk",
"junit_unit_tests",
"net_junit_tests"
],
@@ -992,176 +798,6 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
- "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebView.apk",
- "-v",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "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",
- "instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Debug/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/Debug/apks/AndroidWebView.apk",
- "--isolate-file-path",
- "android_webview/android_webview_test_apk.isolate",
- "--flakiness-dashboard-server",
- "test-results.appspot.com",
- "--verbose",
- "--json-results-file",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test AndroidWebViewTest (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/Debug/apks/ChromePublic.apk",
- "-v",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "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",
- "instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Debug/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/Debug/apks/ChromePublic.apk",
- "--additional-apk",
- "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublicTestSupport.apk",
- "--additional-apk",
- "[SLAVE_BUILD]/src/out/Debug/apks/ChromiumNetTestSupport.apk",
- "--isolate-file-path",
- "chrome/chrome_public_test_apk.isolate",
- "--flakiness-dashboard-server",
- "test-results.appspot.com",
- "--verbose",
- "--json-results-file",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test ChromePublicTest (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/Debug/apks/ContentShell.apk",
- "-v",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "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",
- "instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Debug/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/Debug/apks/ContentShell.apk",
- "--isolate-file-path",
- "content/content_shell_test_apk.isolate",
- "--flakiness-dashboard-server",
- "test-results.appspot.com",
- "--verbose",
- "--json-results-file",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test ContentShellTest (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/Debug/apks/ChromeSyncShell.apk",
- "-v",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "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",
- "instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Debug/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/Debug/apks/ChromeSyncShell.apk",
- "--flakiness-dashboard-server",
- "test-results.appspot.com",
- "--verbose",
- "--json-results-file",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test ChromeSyncShellTest (without patch)",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
- ]
- },
- {
- "cmd": [
"python",
"-u",
"[SLAVE_BUILD]/src/build/android/test_runner.py",
@@ -1293,58 +929,6 @@
"import sys; sys.exit(0)"
],
"cwd": "[SLAVE_BUILD]",
- "name": "AndroidWebViewTest (retry summary)",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
- "@@@STEP_WARNINGS@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import sys; sys.exit(0)"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "ChromePublicTest (retry summary)",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
- "@@@STEP_WARNINGS@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import sys; sys.exit(0)"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "ContentShellTest (retry summary)",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
- "@@@STEP_WARNINGS@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import sys; sys.exit(0)"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "ChromeSyncShellTest (retry summary)",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
- "@@@STEP_WARNINGS@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import sys; sys.exit(0)"
- ],
- "cwd": "[SLAVE_BUILD]",
"name": "base_junit_tests (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",

Powered by Google App Engine
This is Rietveld 408576698