Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: chrome/chrome_tests.gypi

Issue 14273023: Rebuild test history databases when starting up performance_ui_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Speed up profile generation Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b091f6eed6d621f198f1dfcbe0996057a519bb86..c99ee59e180928c94004b1f1a22f42766c51f10c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -33,6 +33,23 @@
],
'targets': [
{
+ 'target_name': 'test_support_ui_runner',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'test_support_common',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'export_dependent_settings': [
+ 'test_support_common',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'test/ui/run_all_unittests.cc',
+ ],
+ },
+ {
'target_name': 'test_support_ui',
'type': 'static_library',
'dependencies': [
@@ -92,6 +109,7 @@
'renderer',
'test_support_common',
'test_support_ui',
+ 'test_support_ui_runner',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../third_party/libxml/libxml.gyp:libxml',
@@ -509,6 +527,7 @@
'chromedriver_support',
'common',
'test_support_ui',
+ 'test_support_ui_runner',
'../base/base.gyp:base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../net/net.gyp:net',
@@ -2210,6 +2229,7 @@
'chrome_resources.gyp:theme_resources',
'test_support_common',
'test_support_ui',
+ 'test_support_ui_runner',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ -2280,9 +2300,12 @@
'test/perf/dom_checker_uitest.cc',
'test/perf/feature_startup_test.cc',
'test/perf/frame_rate/frame_rate_tests.cc',
+ 'test/perf/generate_profile.cc',
+ 'test/perf/generate_profile.h',
'test/perf/indexeddb_uitest.cc',
'test/perf/memory_test.cc',
'test/perf/page_cycler_test.cc',
+ 'test/perf/performance_ui_tests.cc',
'test/perf/shutdown_test.cc',
'test/perf/startup_test.cc',
'test/perf/tab_switching_test.cc',
@@ -2855,51 +2878,6 @@
},
]}, # 'targets'
], # OS=="win"
- ['OS=="linux" or OS=="win"', {
- 'targets': [
- {
- 'target_name': 'generate_profile',
- 'type': 'executable',
- 'dependencies': [
- 'test_support_common',
- 'browser',
- 'renderer',
- 'chrome_resources.gyp:packed_resources',
- '../base/base.gyp:base',
- '../net/net.gyp:net_test_support',
- '../skia/skia.gyp:skia',
- '../sync/sync.gyp:sync',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'tools/profiles/generate_profile.cc',
- 'tools/profiles/thumbnail-inl.h',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '<(allocator_target)',
- ],
- }],
- ],
- 'configurations': {
- 'Debug_Base': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
- },
- },
- },
- },
- }],
- ],
- },
- ]}, # 'targets'
- ],
# If you change this condition, make sure you also change it in all.gyp
# for the chromium_builder_qa target.
['enable_automation==1 and (OS=="mac" or ((OS=="win" or os_posix==1) and target_arch==python_arch))', {

Powered by Google App Engine
This is Rietveld 408576698