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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1855663002: Make android's run_instrumentation_suite() use generated wrapper scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@wrapper-1
Patch Set: Fix wrapper script return value Created 4 years, 8 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
« scripts/slave/recipe_modules/chromium_tests/steps.py ('K') | « scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_amp.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json » ('j') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json
index 02edfdab1b1e1f9cd854bb029b18186333745cb0..aa31893f97a7813786fc02d4c300fb99c5b02c50 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json
@@ -618,178 +618,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",
+ "[SLAVE_BUILD]/src/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/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",
+ "[SLAVE_BUILD]/src/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",
+ "[SLAVE_BUILD]/src/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/>@@@"
]
},
{
"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",
+ "[SLAVE_BUILD]/src/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/>@@@"
]
@@ -798,10 +708,8 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/out/Release/bin/run_mojo_test_apk",
"instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/MojoTest.apk",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--logcat-output-file",
@@ -809,12 +717,11 @@
"--flakiness-dashboard-server",
"test-results.appspot.com",
"--verbose",
- "--release",
"--json-results-file",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test MojoTest (with patch)",
+ "name": "Instrumentation test mojo_test_apk (with patch)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
@@ -1216,178 +1123,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",
+ "[SLAVE_BUILD]/src/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/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",
+ "[SLAVE_BUILD]/src/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",
+ "[SLAVE_BUILD]/src/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/>@@@"
]
},
{
"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",
+ "[SLAVE_BUILD]/src/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/>@@@"
]
@@ -1396,10 +1213,8 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/out/Release/bin/run_mojo_test_apk",
"instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/MojoTest.apk",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--logcat-output-file",
@@ -1407,12 +1222,11 @@
"--flakiness-dashboard-server",
"test-results.appspot.com",
"--verbose",
- "--release",
"--json-results-file",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test MojoTest (without patch)",
+ "name": "Instrumentation test mojo_test_apk (without patch)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
@@ -1600,7 +1414,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@@@"
@@ -1613,7 +1427,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@@@"
@@ -1626,7 +1440,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@@@"
@@ -1639,7 +1453,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@@@"
@@ -1652,7 +1466,7 @@
"import sys; sys.exit(0)"
],
"cwd": "[SLAVE_BUILD]",
- "name": "MojoTest (retry summary)",
+ "name": "mojo_test_apk (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
"@@@STEP_WARNINGS@@@"
« scripts/slave/recipe_modules/chromium_tests/steps.py ('K') | « scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_amp.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json » ('j') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698