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

Unified Diff: webkit/compositor/compositor_tests.gyp

Issue 10920056: Make cc_unittests and webkit_compositor_unittests executable always (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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/cc_tests.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor/compositor_tests.gyp
diff --git a/webkit/compositor/compositor_tests.gyp b/webkit/compositor/compositor_tests.gyp
index 87ecd484090bd8d0044613c9fb5fb64c79183530..3ad352dc9b5910ce0ec90a1606ba46ec76b6ece7 100644
--- a/webkit/compositor/compositor_tests.gyp
+++ b/webkit/compositor/compositor_tests.gyp
@@ -26,22 +26,27 @@
'test/WebLayerTreeViewTestCommon.h',
],
},
- 'conditions': [
- ['use_libcc_for_compositor==1 and component!="shared_library"', {
- 'targets': [
- {
- 'target_name': 'webkit_compositor_unittests',
- 'type' : 'executable',
+ 'targets': [
+ {
+ 'target_name': 'webkit_compositor_unittests',
nduca 2012/08/31 23:16:49 this target name is kinda bad. webkit_unit_tests
+ 'type' : 'executable',
+ 'dependencies': [
+ '../../base/base.gyp:test_support_base',
+ '../../testing/gmock.gyp:gmock',
+ '../../testing/gtest.gyp:gtest',
+ '../../webkit/support/webkit_support.gyp:webkit_support',
+ ],
+ 'sources': [
+ 'test/run_all_unittests.cc',
+ ],
+ 'conditions': [
+ ['use_libcc_for_compositor==1 and component!="shared_library"', {
'dependencies': [
- '../../base/base.gyp:test_support_base',
'../../cc/cc.gyp:cc',
'../../cc/cc_tests.gyp:cc_test_support',
'../../skia/skia.gyp:skia',
- '../../testing/gmock.gyp:gmock',
- '../../testing/gtest.gyp:gtest',
'../../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
'../../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
- '../../webkit/support/webkit_support.gyp:webkit_support',
'compositor.gyp:webkit_compositor',
],
'include_dirs': [
@@ -53,17 +58,9 @@
],
'sources': [
'<@(webkit_compositor_tests_sources)',
- 'test/run_all_unittests.cc',
]
- },
- ],
- }, {
- 'targets': [
- {
- 'target_name': 'webkit_compositor_unittests',
- 'type' : 'none',
- }
+ }],
],
- }],
+ },
],
}
« no previous file with comments | « cc/cc_tests.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698