Index: ui/views/views.gyp |
diff --git a/ui/views/views.gyp b/ui/views/views.gyp |
index 3f41be1adc182d070c5e9110f9fcb36813b9982a..a5c24736d73740a6a18bbf0709f0e2b30234c409 100644 |
--- a/ui/views/views.gyp |
+++ b/ui/views/views.gyp |
@@ -485,6 +485,8 @@ |
'test/views_test_helper.h', |
'test/views_test_helper_mac.h', |
'test/views_test_helper_mac.mm', |
+ 'test/views_test_suite.cc', |
+ 'test/views_test_suite.h', |
'test/widget_test.cc', |
'test/widget_test.h', |
'test/widget_test_mac.mm', |
@@ -551,7 +553,7 @@ |
'layout/box_layout_unittest.cc', |
'layout/grid_layout_unittest.cc', |
'rect_based_targeting_utils_unittest.cc', |
- 'run_all_unittests.cc', |
+ 'test/run_all_unittests.cc', |
'view_model_unittest.cc', |
'view_model_utils_unittest.cc', |
'view_targeter_unittest.cc', |
@@ -585,6 +587,10 @@ |
'widget/desktop_aura/desktop_screen_x11_unittest.cc', |
'widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc', |
], |
+ 'views_perftests_sources': [ |
+ 'controls/button/label_button_perftest.cc', |
+ 'test/run_all_perftests.cc', |
+ ], |
}, |
'targets': [ |
{ |
@@ -748,6 +754,7 @@ |
'type': 'static_library', |
'dependencies': [ |
'../../base/base.gyp:base', |
+ '../../base/base.gyp:test_support_base', |
'../../ipc/ipc.gyp:test_support_ipc', |
'../../skia/skia.gyp:skia', |
'../../testing/gtest.gyp:gtest', |
@@ -760,6 +767,9 @@ |
'../events/platform/events_platform.gyp:events_platform', |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
+ '../resources/ui_resources.gyp:ui_resources', |
+ '../resources/ui_resources.gyp:ui_test_pak', |
+ '../strings/ui_strings.gyp:ui_strings', |
'resources/views_resources.gyp:views_resources', |
'views', |
], |
@@ -806,10 +816,6 @@ |
'../events/events.gyp:events_test_support', |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
- '../resources/ui_resources.gyp:ui_resources', |
- '../resources/ui_resources.gyp:ui_test_pak', |
- '../strings/ui_strings.gyp:ui_strings', |
- 'resources/views_resources.gyp:views_resources', |
'views', |
'views_test_support', |
], |
@@ -896,6 +902,50 @@ |
}], |
], |
}, # target_name: views_unittests |
+ { |
+ # GN version: //ui/views:views_perftests |
+ 'target_name': 'views_perftests', |
+ 'type': 'executable', |
+ 'dependencies': [ |
+ '../../base/base.gyp:test_support_base', |
+ '../../skia/skia.gyp:skia', |
+ '../../testing/gtest.gyp:gtest', |
+ '../compositor/compositor.gyp:compositor', |
+ '../gfx/gfx.gyp:gfx_geometry', |
+ 'views', |
+ 'views_test_support', |
+ ], |
+ 'include_dirs': [ |
+ '..', |
+ ], |
+ 'sources': [ |
+ '<@(views_perftests_sources)', |
+ ], |
+ 'conditions': [ |
+ ['OS=="win"', { |
+ 'dependencies': [ |
+ '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', |
+ ], |
+ 'link_settings': { |
+ 'libraries': [ |
+ '-limm32.lib', |
+ '-loleacc.lib', |
+ '-lcomctl32.lib', |
+ ] |
+ }, |
+ 'include_dirs': [ |
+ '../third_party/wtl/include', |
+ ], |
+ 'msvs_settings': { |
+ 'VCManifestTool': { |
+ 'AdditionalManifestFiles': [ |
+ '$(ProjectDir)\\test\\views_unittest.manifest', |
+ ], |
+ }, |
+ }, |
+ }], |
+ ], |
+ }, # target_name: views_perftests |
], # targets |
'conditions': [ |
['OS=="mac"', { |