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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 10159006: Split test_support_common into test_support_common[_base] (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed path Created 8 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
« no previous file with comments | « no previous file | chrome/empty.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a50156a9a2b8ef8484bf28aa4409beb516fe08b7..64e64807a255d77c2b080aa7a9c71713492fc811 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -34,24 +34,19 @@
{
# This target contains mocks and test utilities that don't belong in
# production libraries but are used by more than one test executable.
- 'target_name': 'test_support_common',
+ 'target_name': 'test_support_common_base',
'type': 'static_library',
'dependencies': [
- 'app/policy/cloud_policy_codegen.gyp:policy',
- 'browser',
- '../sync/protocol/sync_proto.gyp:sync_proto',
- 'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
Nirnimesh 2012/04/20 20:43:14 please keep this list sorted
'chrome_resources.gyp:theme_resources',
- 'common',
'common/extensions/api/api.gyp:api',
- 'plugin',
- 'renderer',
'utility',
'../base/base.gyp:test_support_base',
+ 'app/policy/cloud_policy_codegen.gyp:policy',
+ '../sync/protocol/sync_proto.gyp:sync_proto',
+ 'chrome_resources.gyp:chrome_resources',
'../content/content.gyp:content_app',
'../content/content.gyp:content_gpu',
- '../content/content.gyp:content_plugin',
'../content/content.gyp:content_ppapi_plugin',
'../content/content.gyp:content_renderer',
'../content/content.gyp:content_utility',
@@ -60,20 +55,54 @@
'../ipc/ipc.gyp:test_support_ipc',
'../media/media.gyp:media_test_support',
'../net/net.gyp:net',
- '../net/net.gyp:net_test_support',
- '../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
- '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
],
'export_dependent_settings': [
- 'renderer',
'app/policy/cloud_policy_codegen.gyp:policy',
'../base/base.gyp:test_support_base',
],
'include_dirs': [
'..',
+
+ # copied from skia.
Nirnimesh 2012/04/20 20:43:14 why is skia stuff necessary?
asharif1 2012/04/20 22:20:00 It doesn't build without it since I removed skia f
+ '../skia/config',
+ '../third_party/skia/include/config',
+ '../third_party/skia/include/core',
+ '../third_party/skia/include/effects',
+ '../third_party/skia/include/gpu',
+ '../third_party/skia/include/gpu/gl',
+ '../third_party/skia/include/images',
+ '../third_party/skia/include/pdf',
+ '../third_party/skia/include/ports',
+ '../third_party/skia/include/utils',
+ '../third_party/skia/src/core',
+ '../third_party/skia/src/utils',
+
+ ],
+ 'defines': [
+ # copied from skia.
+ 'SK_BUILD_NO_IMAGE_ENCODE',
+ 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
+ 'GR_STATIC_RECT_VB=1',
+ 'GR_AGGRESSIVE_SHADER_OPTS=1',
+ 'SK_DISABLE_FAST_AA_STROKE_RECT',
+ 'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)',
+
+ # temporary for landing Skia rev 3077 with minimal layout test breakage
+ 'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS',
+
+ # skia uses static initializers to initialize the serialization logic
+ # of its "pictures" library. This is currently not used in chrome; if
+ # it ever gets used the processes that use it need to call
+ # SkGraphics::Init().
+ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0',
+
+ # Temporarily disable the Skia fix in
+ # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that
+ # fix will require substantial rebaselining.
+ 'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX',
],
'sources': [
'app/breakpad_mac_stubs.mm',
@@ -273,6 +302,69 @@
['exclude', '^browser/chromeos'],
],
}],
+ ['OS=="win"', {
+ 'include_dirs': [
+ '<(DEPTH)/third_party/wtl/include',
+ ],
+ }],
+ ['OS=="win" and use_aura==1', {
+ 'sources/': [
+ ['exclude', 'test/base/ui_test_utils_win.cc'],
+ ],
+ }],
+ ],
+ },
+ {
+ # This target contains mocks and test utilities that don't belong in
+ # production libraries but are used by more than one test executable.
+ 'target_name': 'test_support_common',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'app/policy/cloud_policy_codegen.gyp:policy',
+ 'browser',
+ '../sync/protocol/sync_proto.gyp:sync_proto',
+ 'chrome_resources.gyp:chrome_resources',
+ 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources.gyp:theme_resources',
+ 'common',
+ 'common/extensions/api/api.gyp:api',
+ 'plugin',
+ 'renderer',
+ 'test_support_common_base',
+ 'utility',
+ '../base/base.gyp:test_support_base',
+ '../content/content.gyp:content_app',
+ '../content/content.gyp:content_gpu',
+ '../content/content.gyp:content_plugin',
+ '../content/content.gyp:content_ppapi_plugin',
+ '../content/content.gyp:content_renderer',
+ '../content/content.gyp:content_utility',
+ '../content/content.gyp:content_worker',
+ '../content/content.gyp:test_support_content',
+ '../ipc/ipc.gyp:test_support_ipc',
+ '../media/media.gyp:media_test_support',
+ '../net/net.gyp:net',
+ '../net/net.gyp:net_test_support',
+ '../skia/skia.gyp:skia',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+ '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
+ ],
+ 'export_dependent_settings': [
+ 'renderer',
+ 'app/policy/cloud_policy_codegen.gyp:policy',
+ '../base/base.gyp:test_support_base',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'conditions': [
+ ['chromeos==0', {
+ 'sources/': [
+ ['exclude', '^browser/chromeos'],
+ ],
+ }],
['chromeos==1', {
'dependencies': [
'../build/linux/system.gyp:dbus',
@@ -304,6 +396,11 @@
['exclude', 'test/base/ui_test_utils_win.cc'],
],
}],
+ ['OS=="mac"', {
+ 'sources': [
+ 'empty.cc',
+ ],
+ }],
],
},
{
@@ -4416,12 +4513,12 @@
'chrome_resources.gyp:theme_resources',
'debugger',
'syncapi_core',
- 'test_support_common',
+ 'test_support_common_base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
'export_dependent_settings': [
- 'test_support_common',
+ 'test_support_common_base',
],
'include_dirs': [
'..',
« no previous file with comments | « no previous file | chrome/empty.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698