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

Unified Diff: cc/cc_tests.gyp

Issue 10909020: Enable webkit_compositor_unittests (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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 | « cc/CCThreadProxy.cpp ('k') | cc/copyfiles.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/cc_tests.gyp
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index f4b0334068ef5c018ea04431522bd72d3444fccb..e24b71dd766114dd2bc03fb862dd0a291b657940 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -40,6 +40,8 @@
'CCThreadedTest.h',
'CCTiledLayerImplTest.cpp',
'CCTimerTest.cpp',
+ ],
+ 'cc_tests_support_files': [
'test/CCAnimationTestCommon.cpp',
'test/CCAnimationTestCommon.h',
'test/CCLayerTestCommon.cpp',
@@ -60,7 +62,7 @@
'test/FakeWebGraphicsContext3D.h',
'test/FakeWebScrollbarThemeGeometry.h',
'test/MockCCQuadCuller.h',
- ]
+ ],
},
'conditions': [
['use_libcc_for_compositor==1 and component!="shared_library"', {
@@ -69,15 +71,16 @@
'target_name': 'cc_unittests',
'type': 'executable',
'dependencies': [
- '<(DEPTH)/base/base.gyp:test_support_base',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/testing/gmock.gyp:gmock',
- '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
- '<(DEPTH)/skia/skia.gyp:skia',
+ '../base/base.gyp:test_support_base',
+ '../testing/gtest.gyp:gtest',
+ '../testing/gmock.gyp:gmock',
+ '../webkit/support/webkit_support.gyp:webkit_support',
+ '../skia/skia.gyp:skia',
# We have to depend on WTF directly to pick up the correct defines for WTF headers - for instance USE_SYSTEM_MALLOC.
- '<(DEPTH)/third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
- '<(DEPTH)/third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
+ '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+ '../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
'cc.gyp:cc',
+ 'cc_test_support',
],
'defines': [
'WTF_USE_ACCELERATED_COMPOSITING=1',
@@ -92,6 +95,30 @@
'test/run_all_unittests.cc',
],
},
+ {
+ 'target_name': 'cc_test_support',
+ 'type': 'static_library',
+ 'defines': [
+ 'WTF_USE_ACCELERATED_COMPOSITING=1',
+ ],
+ 'include_dirs': [
+ 'stubs',
+ 'test',
+ '.',
+ '..',
+ ],
+ 'dependencies': [
+ '../ui/gl/gl.gyp:gl',
+ '../testing/gtest.gyp:gtest',
+ '../testing/gmock.gyp:gmock',
+ '../skia/skia.gyp:skia',
+ '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+ '../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
+ ],
+ 'sources': [
+ '<@(cc_tests_support_files)',
+ ],
+ },
],
}, {
'targets': [
« no previous file with comments | « cc/CCThreadProxy.cpp ('k') | cc/copyfiles.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698