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

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_android_coverage.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
Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_android_coverage.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_android_coverage.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_android_coverage.json
index deae36b92866db52ec2eea387f0b7cc9c2b4b9ff..e12bfe1e7c061530f5c083dcd6d66689ea7cc885 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_android_coverage.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_android_coverage.json
@@ -316,7 +316,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": {
@@ -487,27 +487,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",
@@ -519,10 +498,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": [
@@ -547,46 +523,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "AndroidWebViewTest.Instrumentation test AndroidWebViewTest (with patch)",
- "~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 (with patch)",
"~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/>@@@"
]
},
{
@@ -601,10 +540,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": [
@@ -629,46 +565,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ChromePublicTest.Instrumentation test ChromePublicTest (with patch)",
- "~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 (with patch)",
"~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/>@@@"
]
},
{
@@ -683,10 +582,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": [
@@ -711,46 +607,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ContentShellTest.Instrumentation test ContentShellTest (with patch)",
- "~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",
- "~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",
+ "name": "Instrumentation test ContentShellTest (with patch)",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -765,10 +624,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": [
@@ -791,25 +647,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ChromeSyncShellTest.Instrumentation test ChromeSyncShellTest (with patch)",
+ "name": "Instrumentation test ChromeSyncShellTest (with patch)",
"~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",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -929,7 +769,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."
@@ -945,7 +785,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",
@@ -981,7 +821,6 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@",
"@@@SET_BUILD_PROPERTY@moreInfoURL@\"http://c.org/p/cr/builders/android_coverage/builds/571/steps/Incremental%20coverage%20report/logs/json.output\"@@@",
"@@@SET_BUILD_PROPERTY@summary@\"Test coverage for this patch: 80/100 lines (80%).\"@@@"
]
@@ -990,59 +829,348 @@
"cmd": [
"python",
"-u",
- "import sys; sys.exit(1)"
+ "[BUILD]/scripts/slave/bot_update.py",
+ "--master",
+ "tryserver.chromium.linux",
+ "--builder",
+ "android_coverage",
+ "--slave",
+ "TestSlavename",
+ "--spec",
+ "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
+ "--root",
+ "src",
+ "--revision_mapping_file",
+ "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+ "--rietveld_server",
+ "https://codereview.chromium.org",
+ "--output_json",
+ "/path/to/tmp/json",
+ "--revision",
+ "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
+ "--force",
+ "--output_manifest"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "bot_update (without patch)",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@Some step text@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[DEPOT_TOOLS]/gclient.py",
+ "runhooks"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "env": {
+ "GYP_CROSSCOMPILE": "1",
+ "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 emma_coverage=1 emma_filter='org.chromium.content.browser.*' fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "gclient runhooks (without patch)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/compile.py",
+ "--target",
+ "Debug",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--build-tool",
+ "ninja",
+ "--compiler",
+ "goma",
+ "--goma-jsonstatus",
+ "/path/to/tmp/json",
+ "--goma-dir",
+ "[BUILD]/goma",
+ "--goma-fail-fast",
+ "--goma-disable-local-fallback",
+ "--",
+ "android_webview_test_apk",
+ "chrome_public_test_apk",
+ "chrome_sync_shell_test_apk",
+ "content_shell_test_apk"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "compile (without patch)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
+ ]
+ },
+ {
+ "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",
+ "--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",
+ "--coverage-dir",
+ "[SLAVE_BUILD]/src/out/Debug/coverage",
+ "--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",
+ "--apk-under-test",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublic.apk",
+ "--isolate-file-path",
+ "chrome/chrome_public_test_apk.isolate",
+ "--flakiness-dashboard-server",
+ "test-results.appspot.com",
+ "--verbose",
+ "--coverage-dir",
+ "[SLAVE_BUILD]/src/out/Debug/coverage",
+ "--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",
+ "--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",
+ "--coverage-dir",
+ "[SLAVE_BUILD]/src/out/Debug/coverage",
+ "--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",
+ "--apk-under-test",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShell.apk",
+ "--flakiness-dashboard-server",
+ "test-results.appspot.com",
+ "--verbose",
+ "--coverage-dir",
+ "[SLAVE_BUILD]/src/out/Debug/coverage",
+ "--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",
+ "import sys; sys.exit(0)"
],
"cwd": "[SLAVE_BUILD]",
- "name": "AndroidWebViewTest (2)",
+ "name": "AndroidWebViewTest (retry summary)",
"~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
- "@@@STEP_FAILURE@@@",
- "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
+ "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+ "@@@STEP_WARNINGS@@@"
]
},
{
"cmd": [
"python",
"-u",
- "import sys; sys.exit(1)"
+ "import sys; sys.exit(0)"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ChromePublicTest (2)",
+ "name": "ChromePublicTest (retry summary)",
"~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
- "@@@STEP_FAILURE@@@",
- "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
+ "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+ "@@@STEP_WARNINGS@@@"
]
},
{
"cmd": [
"python",
"-u",
- "import sys; sys.exit(1)"
+ "import sys; sys.exit(0)"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ContentShellTest (2)",
+ "name": "ContentShellTest (retry summary)",
"~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
- "@@@STEP_FAILURE@@@",
- "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
+ "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+ "@@@STEP_WARNINGS@@@"
]
},
{
"cmd": [
"python",
"-u",
- "import sys; sys.exit(1)"
+ "import sys; sys.exit(0)"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ChromeSyncShellTest (2)",
+ "name": "ChromeSyncShellTest (retry summary)",
"~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
- "@@@STEP_FAILURE@@@"
+ "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+ "@@@STEP_WARNINGS@@@"
]
},
{
@@ -1065,7 +1193,7 @@
"[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
"--output-path",
"[SLAVE_BUILD]/src/out/Debug/full_log",
- "[SLAVE_BUILD]/src/out/logcat_dir"
+ "[SLAVE_BUILD]/src/out/logcat"
],
"cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
@@ -1138,13 +1266,12 @@
"@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@",
"@@@STEP_LOG_LINE@python.inline@ print l@@@",
"@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@",
- "@@@STEP_LOG_END@python.inline@@@",
- "@@@SET_BUILD_PROPERTY@failure_hash@\"0b5a1d30aca247f6f92510b169636d7232768847\"@@@"
+ "@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
- "reason": "4 out of 4 aggregated steps failed. Failures: Step('AndroidWebViewTest (2)') failed with return_code 1, Step('ChromePublicTest (2)') failed with return_code 1, Step('ContentShellTest (2)') failed with return_code 1, Step('ChromeSyncShellTest (2)') failed with return_code 1",
- "status_code": 1
+ "recipe_result": null,
+ "status_code": 0
}
]

Powered by Google App Engine
This is Rietveld 408576698