Commit a5f8582f authored by Wez's avatar Wez Committed by Commit Bot

Revert "[Fuchsia] Disable capture of system logs via SSH'd 'dlog' on ARM64."

This reverts commit 90619203.

Reason for revert: This work-around simply delays the inevitable; test runs still tend to have their SSH connection fail eventually, and so fail.

Original change's description:
> [Fuchsia] Disable capture of system logs via SSH'd 'dlog' on ARM64.
> 
> The 'dlog' SSH channel appears to trigger a bug that causes the package-
> upload step to fail on ARM64 under QEMU.
> 
> Bug: 900790
> Change-Id: Ie5871cef98e94deb936ae591c87a5c90a960b092
> Reviewed-on: https://chromium-review.googlesource.com/c/1325529
> Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Commit-Queue: Wez <wez@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#606522}

TBR=wez@chromium.org,sergeyu@chromium.org,jbudorick@chromium.org

Change-Id: I3f9912cb004e64219238c24af95d6084097e768c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 900790
Reviewed-on: https://chromium-review.googlesource.com/c/1327412Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606560}
parent 370a831d
...@@ -3303,9 +3303,6 @@ ...@@ -3303,9 +3303,6 @@
], ],
"gtest_tests": [ "gtest_tests": [
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
...@@ -3313,8 +3310,7 @@ ...@@ -3313,8 +3310,7 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter", "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter"
"--exclude-system-logs"
], ],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -3322,45 +3318,30 @@ ...@@ -3322,45 +3318,30 @@
"test": "content_unittests" "test": "content_unittests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "cronet_tests" "test": "cronet_tests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "cronet_unittests" "test": "cronet_unittests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "crypto_unittests" "test": "crypto_unittests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "fidlgen_js_unittests" "test": "fidlgen_js_unittests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
...@@ -3368,8 +3349,7 @@ ...@@ -3368,8 +3349,7 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ipc_tests.filter", "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ipc_tests.filter"
"--exclude-system-logs"
], ],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -3377,9 +3357,6 @@ ...@@ -3377,9 +3357,6 @@
"test": "ipc_tests" "test": "ipc_tests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
...@@ -3387,8 +3364,7 @@ ...@@ -3387,8 +3364,7 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.mojo_unittests.filter", "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.mojo_unittests.filter"
"--exclude-system-logs"
], ],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -3396,27 +3372,18 @@ ...@@ -3396,27 +3372,18 @@
"test": "mojo_unittests" "test": "mojo_unittests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "service_manager_unittests" "test": "service_manager_unittests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "skia_unittests" "test": "skia_unittests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
...@@ -3424,8 +3391,7 @@ ...@@ -3424,8 +3391,7 @@
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter", "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
"--exclude-system-logs"
], ],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -3433,18 +3399,12 @@ ...@@ -3433,18 +3399,12 @@
"test": "ui_base_unittests" "test": "ui_base_unittests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "webrunner_browsertests" "test": "webrunner_browsertests"
}, },
{ {
"args": [
"--exclude-system-logs"
],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
......
...@@ -1276,10 +1276,6 @@ ...@@ -1276,10 +1276,6 @@
'additional_compile_targets': [ 'additional_compile_targets': [
'all', 'all',
], ],
# TODO(https://crbug.com/900790): Logging via SSH breaks things.
'args': [
'--exclude-system-logs',
],
'test_suites': { 'test_suites': {
'gtest_tests': 'fuchsia_gtests', 'gtest_tests': 'fuchsia_gtests',
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment