diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 20:40:19 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 20:40:19 +0000 |
| commit | fd8c38a198841fac285bfbf6edc0fd30c0027d6f (patch) | |
| tree | 6b33cef69cba50f427f57621d209be6df764a395 /ui/ui_unittests.gyp | |
| parent | 8cf18437002bf8d7396f95515eba91d262452751 (diff) | |
| download | chromium_src-fd8c38a198841fac285bfbf6edc0fd30c0027d6f.zip chromium_src-fd8c38a198841fac285bfbf6edc0fd30c0027d6f.tar.gz chromium_src-fd8c38a198841fac285bfbf6edc0fd30c0027d6f.tar.bz2 | |
ui: Kill run_ui_unittests target.
After r246620 nobody needs or should include ui/test/test_suite.h. That
allow us to concentrate it in ui/base/.
We move the run_all_unittests.cc into ui/base/test and at the same time
fold test_suite.* into run_all_unittests.cc and rename UITestSuite to
UIBaseTestSuite.
BUG=144345,299841
TEST=ui_unittests
R=tony@chromium.org,ben@chromium.org
TBR=ben
Review URL: https://codereview.chromium.org/142793006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui_unittests.gyp')
| -rw-r--r-- | ui/ui_unittests.gyp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp index 0cf204a..552d8f9 100644 --- a/ui/ui_unittests.gyp +++ b/ui/ui_unittests.gyp @@ -61,26 +61,12 @@ ], }, { - 'target_name': 'run_ui_unittests', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', - '../chrome/chrome_resources.gyp:packed_resources', - 'ui.gyp:ui', - ], - 'sources': [ - 'test/test_suite.cc', - 'test/test_suite.h', - 'test/run_all_unittests.cc', - ], - }, - { 'target_name': 'ui_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ '../base/base.gyp:base', '../base/base.gyp:test_support_base', + '../chrome/chrome_resources.gyp:packed_resources', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -93,7 +79,6 @@ 'gfx/gfx.gyp:gfx_geometry_unittests', 'gfx/gfx.gyp:gfx_test_support', 'resources/ui_resources.gyp:ui_resources', - 'run_ui_unittests', 'shell_dialogs/shell_dialogs.gyp:shell_dialogs', 'ui.gyp:ui', 'ui_test_support', @@ -110,6 +95,7 @@ 'base/resource/data_pack_literal.cc', 'base/resource/data_pack_unittest.cc', 'base/resource/resource_bundle_unittest.cc', + 'base/test/run_all_unittests.cc', 'gfx/animation/animation_container_unittest.cc', 'gfx/animation/animation_unittest.cc', 'gfx/animation/multi_animation_unittest.cc', |