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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.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_Android_Cloud_Tests.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Remoting_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_fyi_Android_Coverage__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json
index 136e7c88fddfd3614b351029e9c967e3952200e4..5e482c5b7c4ab0f7ae2233e9be79c4f5573ec398 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json
@@ -269,7 +269,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": {
@@ -440,27 +440,6 @@
"name": "spawn_device_monitor"
},
{
- "cmd": [],
- "cwd": "[SLAVE_BUILD]",
- "name": "AndroidWebViewTest"
- },
- {
- "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": "AndroidWebViewTest.spawn_logcat_monitor",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
"cmd": [
"[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
"[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebView.apk",
@@ -472,10 +451,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "AndroidWebViewTest.install AndroidWebView.apk",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install AndroidWebView.apk"
},
{
"cmd": [
@@ -500,46 +476,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "AndroidWebViewTest.Instrumentation test AndroidWebViewTest",
- "~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": "AndroidWebViewTest.logcat_dump",
+ "name": "Instrumentation test AndroidWebViewTest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "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_2"
- ],
- "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@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -554,10 +493,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": [
@@ -582,46 +518,9 @@
"/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]/logcat_tmp_2"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "ChromePublicTest.logcat_dump",
+ "name": "Instrumentation test ChromePublicTest",
"~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_3"
- ],
- "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/>@@@"
]
},
{
@@ -636,10 +535,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": [
@@ -664,46 +560,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_3"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "ContentShellTest.logcat_dump",
+ "name": "Instrumentation test ContentShellTest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [],
- "cwd": "[SLAVE_BUILD]",
- "name": "ChromeSyncShellTest"
- },
- {
- "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": "ChromeSyncShellTest.spawn_logcat_monitor",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -718,10 +577,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "ChromeSyncShellTest.install ChromeSyncShell.apk",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install ChromeSyncShell.apk"
},
{
"cmd": [
@@ -744,25 +600,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ChromeSyncShellTest.Instrumentation test ChromeSyncShellTest",
- "~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": "ChromeSyncShellTest.logcat_dump",
+ "name": "Instrumentation test ChromeSyncShellTest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -882,7 +722,7 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"fake/file1.java\": [], \"fake/file2.java;\": [], \"fake/file3.java\": []}",
- "[TMP_BASE]/coverage_tmp_5/file_changes.json"
+ "[TMP_BASE]/coverage_tmp_1/file_changes.json"
],
"cwd": "[SLAVE_BUILD]",
"name": "Saving changed lines for revision."
@@ -898,7 +738,7 @@
"--emma-dir",
"[SLAVE_BUILD]/src/out/Debug/coverage/coverage_html",
"--lines-for-coverage",
- "[TMP_BASE]/coverage_tmp_5/file_changes.json"
+ "[TMP_BASE]/coverage_tmp_1/file_changes.json"
],
"cwd": "[SLAVE_BUILD]/src",
"name": "Incremental coverage report",
@@ -959,7 +799,7 @@
"[SLAVE_BUILD]/src/out/Debug/full_log",
"--",
"[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
- "[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_Android_Cloud_Tests.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Remoting_Tests.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698