diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 04:35:04 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 04:35:04 +0000 |
| commit | 2e4dc2e1dd5369266f371656d8461f9b4bc92846 (patch) | |
| tree | 035b886ef30f4ac6aee1f76f80c929b20c7dcb53 | |
| parent | c091256765bf1243b4f16a5416ef7dde3432b0a2 (diff) | |
| download | chromium_src-2e4dc2e1dd5369266f371656d8461f9b4bc92846.zip chromium_src-2e4dc2e1dd5369266f371656d8461f9b4bc92846.tar.gz chromium_src-2e4dc2e1dd5369266f371656d8461f9b4bc92846.tar.bz2 | |
Make gyp inclusion of render_text_unittest.cc consistent with the implementation.
This puts render_text_unittest.cc in the list of files included by default and disables it per the same criteria as render_text.cc in ui.gyp.
Also disables RenderTextTest.DisplayRectShowsCursorRTL on desktop Linux since it fails (previously, RenderTextTest was not enabled on desktop Linux).
BUG=134009
TEST=RenderTextTest.* ui_unittests.
Review URL: https://chromiumcodereview.appspot.com/10627007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143535 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/render_text_unittest.cc | 3 | ||||
| -rw-r--r-- | ui/ui_unittests.gypi | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc index bc79dc7..e392334 100644 --- a/ui/gfx/render_text_unittest.cc +++ b/ui/gfx/render_text_unittest.cc @@ -1180,6 +1180,8 @@ TEST_F(RenderTextTest, DisplayRectShowsCursorLTR) { EXPECT_EQ(width, render_text->GetUpdatedCursorBounds().x()); } +// TODO(asvitkine): This test fails on desktop Linux. http://crbug.com/134009 +#if !defined(OS_LINUX) || defined(OS_CHROMEOS) TEST_F(RenderTextTest, DisplayRectShowsCursorRTL) { // Set the locale to Hebrew for RTL UI. std::string locale = l10n_util::GetApplicationLocale(""); @@ -1238,5 +1240,6 @@ TEST_F(RenderTextTest, DisplayRectShowsCursorRTL) { // Reset locale. base::i18n::SetICUDefaultLocale(locale); } +#endif // !defined(OS_LINUX) || defined(OS_CHROMEOS) } // namespace gfx diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index ef3dfb1..5bbeade 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -100,6 +100,7 @@ 'gfx/image/image_unittest_util.h', 'gfx/insets_unittest.cc', 'gfx/rect_unittest.cc', + 'gfx/render_text_unittest.cc', 'gfx/screen_unittest.cc', 'gfx/shadow_value_unittest.cc', 'gfx/skbitmap_operations_unittest.cc', @@ -194,8 +195,8 @@ '../build/linux/system.gyp:gtk', ], }], - ['toolkit_views==1 and OS!="mac"', { - 'sources': [ + ['toolkit_views==0 and use_canvas_skia==0', { + 'sources!': [ 'gfx/render_text_unittest.cc', ], }], |