diff options
| author | cleichner <cleichner@chromium.org> | 2016-02-08 17:26:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-09 01:28:18 +0000 |
| commit | 8de0a333644bcff2586292cd81238615dfdc9d8a (patch) | |
| tree | 6bb33a354a3c23ce335b917289a7bb4739f0a20b /chromecast | |
| parent | 7b70a22cb5eb3f6c62dcd76d80c213d344d68ddb (diff) | |
| download | chromium_src-8de0a333644bcff2586292cd81238615dfdc9d8a.zip chromium_src-8de0a333644bcff2586292cd81238615dfdc9d8a.tar.gz chromium_src-8de0a333644bcff2586292cd81238615dfdc9d8a.tar.bz2 | |
Revert of [Chromecast] Disable alsa_cma_backend_unittest on desktop x86. (patchset #3 id:40001 of https://codereview.chromium.org/1563053002/ )
Reason for revert:
alsa_cma_backend_unittests is fixed https://codereview.chromium.org/1673843004/
Original issue's description:
> [Chromecast] Disable alsa_cma_backend_unittest on desktop x86.
>
> Internal Cast-CQ crashes when this is run, for unknown reasons. Disable
> this test on the x86 platform so that it is not run while this issue is
> being investigated. This CL should be reverted when this bug is
> resolved.
>
> Bug: b/26429268
>
> BUG=
>
> Committed: https://crrev.com/7f1edfdfb7c282704becfaa5f75db3dbbaa5644b
> Cr-Commit-Position: refs/heads/master@{#367978}
TBR=halliwell@chromium.org,kmackay@chromium.org,servolk@chromium.org,alokp@chromium.org,slan@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=
Review URL: https://codereview.chromium.org/1675043002
Cr-Commit-Position: refs/heads/master@{#374253}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/BUILD.gn | 4 | ||||
| -rw-r--r-- | chromecast/chromecast_tests.gypi | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn index 1733a59..5fac3c6f 100644 --- a/chromecast/BUILD.gn +++ b/chromecast/BUILD.gn @@ -120,9 +120,7 @@ cast_test_group("cast_tests") { # --test-launcher-jobs=1 => so internal code can bind to port filters += [ "cast_shell_browser_test --no-sandbox --enable-local-file-accesses --enable-cma-media-pipeline --ozone-platform=cast --test-launcher-jobs=1" ] - # TODO(slan): Reenable this test for Desktop x86 when CQ supports it. - # (b/26429268) - if (use_alsa && !is_cast_desktop_build) { + if (use_alsa) { tests += [ "//chromecast/media/cma/backend/alsa:alsa_cma_backend_unittests" ] } diff --git a/chromecast/chromecast_tests.gypi b/chromecast/chromecast_tests.gypi index bc7b9ec..4bd94b8 100644 --- a/chromecast/chromecast_tests.gypi +++ b/chromecast/chromecast_tests.gypi @@ -189,9 +189,7 @@ ], }, 'conditions': [ - # TODO(slan): Reenable this test for Desktop x86 when CQ supports it. - # (b/26429268) - ['use_alsa==1 and is_cast_desktop_build==0', { + ['use_alsa==1', { 'dependencies': [ 'media/media.gyp:alsa_cma_backend_unittests', ], |