diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-05 18:12:14 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-05 18:12:14 +0000 |
| commit | 12961e3c7fe0ae1d195fa002fc92e7ee5db45f80 (patch) | |
| tree | 4d7360603521cd440ca9abe47738a17bd8a72922 | |
| parent | f79b58c87dcc724b0752955760133b3b9dc24475 (diff) | |
| download | chromium_src-12961e3c7fe0ae1d195fa002fc92e7ee5db45f80.zip chromium_src-12961e3c7fe0ae1d195fa002fc92e7ee5db45f80.tar.gz chromium_src-12961e3c7fe0ae1d195fa002fc92e7ee5db45f80.tar.bz2 | |
ui: Move more gfx unit tests into gfx_unittests target.
These are non problematic tests that do not require any extra setup and
do not depend on any global state, so it is safe to move straightforward
to gfx_unittests.
BUG=331829
TEST=ui_unittests, gfx_unittests
TBR=danakj@chromium.org,ben@chromium.org
Review URL: https://codereview.chromium.org/268043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268223 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/gfx.gyp | 7 | ||||
| -rw-r--r-- | ui/ui_unittests.gyp | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp index 79b2642..7312ae8 100644 --- a/ui/gfx/gfx.gyp +++ b/ui/gfx/gfx.gyp @@ -465,6 +465,9 @@ 'animation/animation_unittest.cc', 'animation/multi_animation_unittest.cc', 'animation/slide_animation_unittest.cc', + 'animation/tween_unittest.cc', + 'blit_unittest.cc', + 'break_list_unittest.cc', 'codec/png_codec_unittest.cc', 'color_utils_unittest.cc', 'display_unittest.cc', @@ -486,9 +489,12 @@ 'range/range_mac_unittest.mm', 'range/range_unittest.cc', 'range/range_win_unittest.cc', + 'sequential_id_generator_unittest.cc', 'shadow_value_unittest.cc', 'skbitmap_operations_unittest.cc', 'skrect_conversion_unittest.cc', + 'transform_util_unittest.cc', + 'utf16_indexing_unittest.cc', ], 'dependencies': [ '../../base/base.gyp:base', @@ -499,6 +505,7 @@ '../../third_party/libpng/libpng.gyp:libpng', 'gfx', 'gfx_geometry', + 'gfx_test_support', ], 'conditions': [ ['OS == "ios"', { diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp index be1c302..75c385c 100644 --- a/ui/ui_unittests.gyp +++ b/ui/ui_unittests.gyp @@ -71,9 +71,6 @@ 'base/text/bytes_formatting_unittest.cc', 'base/view_prop_unittest.cc', 'base/webui/web_ui_util_unittest.cc', - 'gfx/animation/tween_unittest.cc', - 'gfx/blit_unittest.cc', - 'gfx/break_list_unittest.cc', 'gfx/canvas_unittest.cc', 'gfx/canvas_unittest_mac.mm', 'gfx/codec/jpeg_codec_unittest.cc', @@ -81,9 +78,6 @@ 'gfx/font_list_unittest.cc', 'gfx/platform_font_mac_unittest.mm', 'gfx/render_text_unittest.cc', - 'gfx/sequential_id_generator_unittest.cc', - 'gfx/transform_util_unittest.cc', - 'gfx/utf16_indexing_unittest.cc', ], 'includes': [ 'display/display_unittests.gypi', |