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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1511403002: Revert "[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 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
« no previous file with comments | « 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 3c62a0462af6668a6db834de824ac6b5e9fa8c4d..c71ac2e970bb619908f285b87b0b5539d8decdcd 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
@@ -254,7 +254,7 @@
"[BUILD]/scripts/slave/daemonizer.py",
"--",
"[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
- "[SLAVE_BUILD]/src/out/logcat_dir"
+ "[SLAVE_BUILD]/src/out/logcat"
],
"cwd": "[SLAVE_BUILD]",
"env": {
@@ -425,27 +425,6 @@
"name": "spawn_device_monitor"
},
{
- "cmd": [],
- "cwd": "[SLAVE_BUILD]",
- "name": "ChromePublicTest"
- },
- {
- "cmd": [
- "[BUILD]/scripts/slave/daemonizer.py",
- "--",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
- "[TMP_BASE]/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",
@@ -458,10 +437,7 @@
"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@@@"
- ]
+ "name": "install ChromePublic.apk"
},
{
"cmd": [
@@ -485,46 +461,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ChromePublicTest.Instrumentation test ChromePublicTest",
+ "name": "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]/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]/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@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -540,10 +479,7 @@
"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@@@"
- ]
+ "name": "install ContentShell.apk"
},
{
"cmd": [
@@ -567,46 +503,9 @@
"/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]/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]/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",
+ "name": "Instrumentation test ContentShellTest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -630,47 +529,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "breakpad_unittests"
},
{
"cmd": [
@@ -692,26 +551,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/logcat_tmp_4"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "sandbox_linux_unittests.logcat_dump",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "sandbox_linux_unittests"
},
{
"cmd": [
@@ -887,7 +727,7 @@
"[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
"--output-path",
"[SLAVE_BUILD]/src/out/Release/full_log",
- "[SLAVE_BUILD]/src/out/logcat_dir"
+ "[SLAVE_BUILD]/src/out/logcat"
],
"cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
« no previous file with comments | « 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