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

Side by Side Diff: ui/aura/aura.gyp

Issue 8805033: Makes tests either use mock compositor or mock WebGraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback and tweaks for win_aura Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/test/content_test_suite.cc ('k') | ui/aura/test/test_suite.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 'window_observer.h', 53 'window_observer.h',
54 'window_types.h', 54 'window_types.h',
55 ], 55 ],
56 }, 56 },
57 { 57 {
58 'target_name': 'test_support_aura', 58 'target_name': 'test_support_aura',
59 'type': 'static_library', 59 'type': 'static_library',
60 'dependencies': [ 60 'dependencies': [
61 '../../skia/skia.gyp:skia', 61 '../../skia/skia.gyp:skia',
62 '../../testing/gtest.gyp:gtest', 62 '../../testing/gtest.gyp:gtest',
63 '../gfx/compositor/compositor.gyp:test_compositor',
64 '../ui.gyp:ui', 63 '../ui.gyp:ui',
65 'aura', 64 'aura',
66 ], 65 ],
67 'include_dirs': [ 66 'include_dirs': [
68 '..', 67 '..',
69 ], 68 ],
70 'sources': [ 69 'sources': [
71 'test/aura_test_base.cc', 70 'test/aura_test_base.cc',
72 'test/aura_test_base.h', 71 'test/aura_test_base.h',
73 'test/event_generator.cc', 72 'test/event_generator.cc',
74 'test/event_generator.h', 73 'test/event_generator.h',
75 'test/test_event_filter.cc', 74 'test/test_event_filter.cc',
76 'test/test_event_filter.h', 75 'test/test_event_filter.h',
77 'test/test_stacking_client.cc', 76 'test/test_stacking_client.cc',
78 'test/test_stacking_client.h', 77 'test/test_stacking_client.h',
79 'test/test_windows.cc', 78 'test/test_windows.cc',
80 'test/test_windows.h', 79 'test/test_windows.h',
81 'test/test_window_delegate.cc', 80 'test/test_window_delegate.cc',
82 'test/test_window_delegate.h', 81 'test/test_window_delegate.h',
83 ], 82 ],
83 'conditions': [
84 ['use_webkit_compositor==0', {
85 'dependencies': [
86 '../gfx/compositor/compositor.gyp:test_compositor',
87 ],
88 }],
89 ],
84 }, 90 },
85 { 91 {
86 'target_name': 'aura_demo', 92 'target_name': 'aura_demo',
87 'type': 'executable', 93 'type': 'executable',
88 'dependencies': [ 94 'dependencies': [
89 '../../base/base.gyp:base', 95 '../../base/base.gyp:base',
90 '../../base/base.gyp:base_i18n', 96 '../../base/base.gyp:base_i18n',
91 '../../skia/skia.gyp:skia', 97 '../../skia/skia.gyp:skia',
92 '../../third_party/icu/icu.gyp:icui18n', 98 '../../third_party/icu/icu.gyp:icui18n',
93 '../../third_party/icu/icu.gyp:icuuc', 99 '../../third_party/icu/icu.gyp:icuuc',
(...skipping 15 matching lines...) Expand all
109 }, 115 },
110 { 116 {
111 'target_name': 'aura_unittests', 117 'target_name': 'aura_unittests',
112 'type': 'executable', 118 'type': 'executable',
113 'dependencies': [ 119 'dependencies': [
114 '../../base/base.gyp:test_support_base', 120 '../../base/base.gyp:test_support_base',
115 '../../chrome/chrome_resources.gyp:packed_resources', 121 '../../chrome/chrome_resources.gyp:packed_resources',
116 '../../skia/skia.gyp:skia', 122 '../../skia/skia.gyp:skia',
117 '../../testing/gtest.gyp:gtest', 123 '../../testing/gtest.gyp:gtest',
118 '../gfx/compositor/compositor.gyp:compositor_test_support', 124 '../gfx/compositor/compositor.gyp:compositor_test_support',
119 '../gfx/compositor/compositor.gyp:test_compositor',
120 '../gfx/gl/gl.gyp:gl', 125 '../gfx/gl/gl.gyp:gl',
121 '../ui.gyp:gfx_resources', 126 '../ui.gyp:gfx_resources',
122 '../ui.gyp:ui', 127 '../ui.gyp:ui',
123 '../ui.gyp:ui_resources', 128 '../ui.gyp:ui_resources',
124 'test_support_aura', 129 'test_support_aura',
125 'aura', 130 'aura',
126 ], 131 ],
127 'include_dirs': [ 132 'include_dirs': [
128 '..', 133 '..',
129 ], 134 ],
130 'sources': [ 135 'sources': [
131 'test/run_all_unittests.cc', 136 'test/run_all_unittests.cc',
132 'test/test_suite.cc', 137 'test/test_suite.cc',
133 'test/test_suite.h', 138 'test/test_suite.h',
134 'root_window_unittest.cc', 139 'root_window_unittest.cc',
135 'event_filter_unittest.cc', 140 'event_filter_unittest.cc',
136 'window_unittest.cc', 141 'window_unittest.cc',
137 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 142 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
138 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 143 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
139 ], 144 ],
140 # osmesa GL implementation is used on linux. 145 # osmesa GL implementation is used on linux.
141 'conditions': [ 146 'conditions': [
142 ['OS=="linux"', { 147 ['OS=="linux"', {
143 'dependencies': [ 148 'dependencies': [
144 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 149 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
145 ], 150 ],
146 }], 151 }],
152 ['use_webkit_compositor==1', {
153 'dependencies': [
154 '../gfx/compositor/compositor.gyp:compositor',
155 ],
156 }, { # use_webkit_compositor!=1
157 'dependencies': [
158 '../gfx/compositor/compositor.gyp:test_compositor',
159 ],
160 }],
147 ], 161 ],
148 }, 162 },
149 ], 163 ],
150 } 164 }
OLDNEW
« no previous file with comments | « content/test/content_test_suite.cc ('k') | ui/aura/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698