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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json

Issue 1465343002: [Android] Add context manager to record logcat during step(s). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 5 years, 1 month 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_android/example.py ('K') | « scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
index c72e2f5be696e334578a6308d9e8b6b86a6d9e51..02e65f0e6080f72ad0f1526065cb2d9c1d06fd19 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
@@ -424,66 +424,191 @@
"cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
- {"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",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--apk-under-test",
- "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.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",
- "~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",
- "instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.apk",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--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",
- "~followup_annotations": ["@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"]},
+ {
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "ChromePublicTest"
+ },
+ {
+ "cmd": [
+ "[BUILD]/scripts/slave/daemonizer.py",
+ "--",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
+ "[TMP_BASE]/test_logcat_tmp_1"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "ChromePublicTest.spawn_logcat_monitor",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "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": "ChromePublicTest.install ChromePublic.apk",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "instrumentation",
+ "--test-apk",
+ "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.apk",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--apk-under-test",
+ "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.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": "ChromePublicTest.Instrumentation test ChromePublicTest",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/tee.py",
+ "/path/to/tmp/logcat",
+ "--",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+ "[TMP_BASE]/test_logcat_tmp_1"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "ChromePublicTest.logcat_dump",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "ContentShellTest"
+ },
+ {
+ "cmd": [
+ "[BUILD]/scripts/slave/daemonizer.py",
+ "--",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
+ "[TMP_BASE]/test_logcat_tmp_2"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "ContentShellTest.spawn_logcat_monitor",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "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": "ContentShellTest.install ContentShell.apk",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "instrumentation",
+ "--test-apk",
+ "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.apk",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--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": "ContentShellTest.Instrumentation test ContentShellTest",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/tee.py",
+ "/path/to/tmp/logcat",
+ "--",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+ "[TMP_BASE]/test_logcat_tmp_2"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "ContentShellTest.logcat_dump",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "breakpad_unittests"
+ },
+ {
+ "cmd": [
+ "[BUILD]/scripts/slave/daemonizer.py",
+ "--",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
+ "[TMP_BASE]/test_logcat_tmp_3"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "breakpad_unittests.spawn_logcat_monitor",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
{
"cmd": [
"python",
@@ -505,7 +630,47 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "breakpad_unittests"
+ "name": "breakpad_unittests.breakpad_unittests",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/tee.py",
+ "/path/to/tmp/logcat",
+ "--",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+ "[TMP_BASE]/test_logcat_tmp_3"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "breakpad_unittests.logcat_dump",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "sandbox_linux_unittests"
+ },
+ {
+ "cmd": [
+ "[BUILD]/scripts/slave/daemonizer.py",
+ "--",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
+ "[TMP_BASE]/test_logcat_tmp_4"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "sandbox_linux_unittests.spawn_logcat_monitor",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -527,7 +692,26 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "sandbox_linux_unittests"
+ "name": "sandbox_linux_unittests.sandbox_linux_unittests",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/tee.py",
+ "/path/to/tmp/logcat",
+ "--",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+ "[TMP_BASE]/test_logcat_tmp_4"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "sandbox_linux_unittests.logcat_dump",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -780,4 +964,4 @@
"recipe_result": null,
"status_code": 0
}
-]
+]
« scripts/slave/recipe_modules/chromium_android/example.py ('K') | « scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698