diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-29 20:30:48 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-29 20:30:48 +0000 |
| commit | 3b206ba1292961220243af1e4467ca5238816537 (patch) | |
| tree | 85280d0441825ae0266733da3e251a20ebf6c5bf | |
| parent | 791e6c0a178b4c0f23301a87c2902c16fe3dbd15 (diff) | |
| download | chromium_src-3b206ba1292961220243af1e4467ca5238816537.zip chromium_src-3b206ba1292961220243af1e4467ca5238816537.tar.gz chromium_src-3b206ba1292961220243af1e4467ca5238816537.tar.bz2 | |
ui: Move RenderText tests into gfx_unittests target.
This is pretty straightforward, just moving the render_text_unittest.cc
entries from ui_unittests.gyp to gfx_tests.gyp, since now everything
needed for it to run is already provided by the gfx_unittests framework.
BUG=331829
TEST=ui_unittests, gfx_unittests
TBR=ben@chromium.org,danakj@chromium.org
Review URL: https://codereview.chromium.org/354323002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280551 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/gfx_tests.gyp | 7 | ||||
| -rw-r--r-- | ui/ui_unittests.gyp | 11 |
2 files changed, 7 insertions, 11 deletions
diff --git a/ui/gfx/gfx_tests.gyp b/ui/gfx/gfx_tests.gyp index dda6d14..8435393d 100644 --- a/ui/gfx/gfx_tests.gyp +++ b/ui/gfx/gfx_tests.gyp @@ -59,6 +59,7 @@ 'range/range_mac_unittest.mm', 'range/range_unittest.cc', 'range/range_win_unittest.cc', + 'render_text_unittest.cc', 'sequential_id_generator_unittest.cc', 'shadow_value_unittest.cc', 'skbitmap_operations_unittest.cc', @@ -114,6 +115,7 @@ 'canvas_unittest.cc', 'font_list_unittest.cc', 'font_unittest.cc', + 'render_text_unittest.cc', 'text_elider_unittest.cc', ], }], @@ -122,6 +124,11 @@ '../../testing/android/native_test.gyp:native_test_native_code', ], }], + ['OS=="android" or OS=="ios"', { + 'sources!': [ + 'render_text_unittest.cc', + ], + }], ], } ], diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp index f510872..0c045a4 100644 --- a/ui/ui_unittests.gyp +++ b/ui/ui_unittests.gyp @@ -68,7 +68,6 @@ 'base/webui/web_ui_util_unittest.cc', 'gfx/canvas_unittest_mac.mm', 'gfx/platform_font_mac_unittest.mm', - 'gfx/render_text_unittest.cc', ], 'includes': [ 'display/display_unittests.gypi', @@ -163,11 +162,6 @@ 'events/platform/x11/x11_events_platform.gyp:x11_events_platform', ], }], - ['OS=="android" or OS=="ios"', { - 'sources!': [ - 'gfx/render_text_unittest.cc', - ], - }], ['OS!="win" or use_aura==0', { 'sources!': [ 'base/view_prop_unittest.cc', @@ -202,11 +196,6 @@ 'gfx/screen_unittest.cc', ], }], - ['use_ozone==1 and use_pango==0', { - 'sources!': [ - 'gfx/render_text_unittest.cc', - ], - }], ['chromeos==1', { 'dependencies': [ '../chromeos/chromeos.gyp:chromeos', |