Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index bac25b515ac0deebd9c105d19bacbf499d697db1..ec355908fabdd88569fb847975f6c3e2d0392951 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -1546,6 +1546,19 @@ |
'test/base/browser_perf_tests_main.cc', |
'test/data/resource.rc', |
], |
+ 'chrome_ui_perf_tests_sources': [ |
+ 'test/base/browser_with_content_test.cc', |
+ 'test/base/browser_with_content_test.h', |
+ 'test/base/interactive_test_utils.cc', |
+ 'test/base/interactive_test_utils.h', |
+ 'test/base/interactive_test_utils_aura.cc', |
+ 'test/base/interactive_test_utils_aura.h', |
+ 'test/base/interactive_test_utils_mac.mm', |
+ 'test/base/interactive_test_utils_views.cc', |
+ 'test/base/interactive_test_utils_win.cc', |
+ 'test/base/interactive_ui_tests_main.cc', |
+ 'browser/ui/energy_browsertest.cc', |
+ ] |
}, |
'includes': [ |
'js_unittest_vars.gypi', |
@@ -3082,7 +3095,92 @@ |
}], |
], |
}, # target 'load_library_perf_tests' |
- ], |
+ { |
+ # Executable to measure power usage and interactive UI performance. |
+ # GN version: //chrome/test:ui_perf_tests (TODO) |
+ 'target_name': 'ui_perf_tests', |
+ 'type': 'executable', |
+ 'dependencies': [ |
+ 'browser', |
+ 'chrome', |
+ 'chrome_resources.gyp:chrome_resources', |
+ 'chrome_resources.gyp:chrome_strings', |
+ 'chrome_resources.gyp:packed_extra_resources', |
+ 'chrome_resources.gyp:packed_resources', |
+ 'test_support_common', |
+ 'test_support_ui', |
+ '../content/app/resources/content_resources.gyp:content_resources', |
+ '../testing/gtest.gyp:gtest', |
+ '../ui/base/ui_base.gyp:ui_base_test_support', |
+ # Runtime dependencies |
+ '../third_party/mesa/mesa.gyp:osmesa', |
+ ], |
+ 'include_dirs': [ |
+ '..', |
+ ], |
+ 'defines': [ |
+ 'HAS_OUT_OF_PROC_TEST_RUNNER', |
+ ], |
+ 'sources': [ |
+ '<@(chrome_ui_perf_tests_sources)', |
+ ], |
+ 'conditions': [ |
+ ['OS=="mac"', { |
+ # See comment about the same line in chrome/chrome_tests.gypi. |
+ 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
+ }], |
+ ['toolkit_views==1', { |
+ 'dependencies': [ |
+ '../ui/views/views.gyp:views', |
+ '../ui/views/views.gyp:views_test_support', |
+ ], |
+ }], |
+ ['mac_views_browser==1', { |
+ 'sources': [ |
+ # mac_views_browser=1 strips these out of the browser, but |
+ # interactive_test_utils_mac.mm still wants access to them for now. |
+ 'browser/ui/cocoa/view_id_util.h', |
+ 'browser/ui/cocoa/view_id_util.mm', |
+ ], |
+ }], |
+ ['chromeos==1', { |
+ 'dependencies': [ |
+ '../ash/ash_resources.gyp:ash_resources', |
+ '../chromeos/chromeos.gyp:chromeos', |
+ ], |
+ }], |
+ ['OS=="win"', { |
+ 'include_dirs': [ |
+ '../third_party/wtl/include', |
+ ], |
+ 'dependencies': [ |
+ '../ui/resources/ui_resources.gyp:ui_resources', |
+ 'chrome.gyp:chrome_version_resources', |
+ ], |
+ 'sources': [ |
+ # TODO: It would be nice to have these pulled in |
+ # automatically from direct_dependent_settings in |
+ # their various targets (net.gyp:net_resources, etc.), |
+ # but that causes errors in other targets when |
+ # resulting .res files get referenced multiple times. |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', |
+ ], |
+ 'msvs_settings': { |
+ 'VCLinkerTool': { |
+ 'conditions': [ |
+ ['incremental_chrome_dll==1', { |
+ 'UseLibraryDependencyInputs': "true", |
+ }], |
+ ], |
+ }, |
+ }, |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ 'msvs_disabled_warnings': [ 4267, ], |
+ }], # OS != "win" |
+ ], # conditions |
+ }, # target_name:ui_perf_tests |
+ ], # targets |
'conditions': [ |
['OS == "android"', { |
'targets': [ |