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

Side by Side Diff: ui/views/mus/BUILD.gn

Issue 2654173002: Revert to using on-disk catalog manifest for views mus tests (Closed)
Patch Set: Created 3 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/views/mus/views_mus_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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//services/catalog/public/tools/catalog.gni") 7 import("//services/catalog/public/tools/catalog.gni")
8 import("//services/service_manager/public/cpp/service.gni") 8 import("//services/service_manager/public/cpp/service.gni")
9 import("//services/service_manager/public/service_manifest.gni") 9 import("//services/service_manager/public/service_manifest.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 sources = [ 114 sources = [
115 "../test/native_widget_factory_aura_mus.cc", 115 "../test/native_widget_factory_aura_mus.cc",
116 "test_utils.h", 116 "test_utils.h",
117 "views_mus_test_suite.cc", 117 "views_mus_test_suite.cc",
118 "views_mus_test_suite.h", 118 "views_mus_test_suite.h",
119 ] 119 ]
120 120
121 deps = [ 121 deps = [
122 ":mus", 122 ":mus",
123 ":views_mus_tests_catalog_source",
124 "//base", 123 "//base",
125 "//base/test:test_support", 124 "//base/test:test_support",
126 "//mojo/edk/system", 125 "//mojo/edk/system",
127 "//services/catalog:lib", 126 "//services/catalog:lib",
128 "//services/service_manager/background:lib", 127 "//services/service_manager/background:lib",
129 "//services/service_manager/public/cpp:sources", 128 "//services/service_manager/public/cpp:sources",
130 "//services/ui/common:mus_common", 129 "//services/ui/common:mus_common",
131 "//testing/gtest", 130 "//testing/gtest",
132 "//ui/aura", 131 "//ui/aura",
133 "//ui/aura:test_support", 132 "//ui/aura:test_support",
134 "//ui/gl:test_support", 133 "//ui/gl:test_support",
135 "//ui/resources", 134 "//ui/resources",
136 "//ui/resources:ui_test_pak", 135 "//ui/resources:ui_test_pak",
137 "//ui/views", 136 "//ui/views",
138 "//ui/views:test_support_internal", 137 "//ui/views:test_support_internal",
139 ] 138 ]
140 139
141 data_deps = [ 140 data_deps = [
141 ":views_mus_tests_catalog",
142 "//ui/resources:ui_test_pak_data", 142 "//ui/resources:ui_test_pak_data",
143 ] 143 ]
144 } 144 }
145 145
146 test("views_mus_unittests") { 146 test("views_mus_unittests") {
147 testonly = true 147 testonly = true
148 148
149 sources = [ 149 sources = [
150 "desktop_window_tree_host_mus_unittest.cc", 150 "desktop_window_tree_host_mus_unittest.cc",
151 "pointer_watcher_event_router_unittest.cc", 151 "pointer_watcher_event_router_unittest.cc",
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 "//ui/strings", 184 "//ui/strings",
185 "//ui/touch_selection", 185 "//ui/touch_selection",
186 "//ui/views", 186 "//ui/views",
187 "//ui/views:test_support_internal", 187 "//ui/views:test_support_internal",
188 "//ui/views:views_unittests_sources", 188 "//ui/views:views_unittests_sources",
189 "//ui/wm", 189 "//ui/wm",
190 "//url", 190 "//url",
191 ] 191 ]
192 192
193 data_deps = [ 193 data_deps = [
194 ":views_mus_tests_catalog_copy",
194 "//services/ui/ime/test_ime_driver", 195 "//services/ui/ime/test_ime_driver",
195 "//services/ui/test_wm", 196 "//services/ui/test_wm",
196 ] 197 ]
197 198
198 if (is_win) { 199 if (is_win) {
199 deps += [ 200 deps += [
200 "//build/win:default_exe_manifest", 201 "//build/win:default_exe_manifest",
201 "//third_party/iaccessible2", 202 "//third_party/iaccessible2",
202 "//third_party/wtl", 203 "//third_party/wtl",
203 ] 204 ]
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 "//ui/events:events_base", 245 "//ui/events:events_base",
245 "//ui/events:test_support", 246 "//ui/events:test_support",
246 "//ui/gl:test_support", 247 "//ui/gl:test_support",
247 "//ui/touch_selection", 248 "//ui/touch_selection",
248 "//ui/views", 249 "//ui/views",
249 "//ui/views:test_support_internal", 250 "//ui/views:test_support_internal",
250 "//ui/wm", 251 "//ui/wm",
251 ] 252 ]
252 253
253 data_deps = [ 254 data_deps = [
255 ":views_mus_tests_catalog_copy",
254 "//services/ui/test_wm", 256 "//services/ui/test_wm",
255 ] 257 ]
256 258
257 if (is_win) { 259 if (is_win) {
258 deps += [ 260 deps += [
259 "//build/win:default_exe_manifest", 261 "//build/win:default_exe_manifest",
260 "//third_party/iaccessible2", 262 "//third_party/iaccessible2",
261 "//third_party/wtl", 263 "//third_party/wtl",
262 ] 264 ]
263 libs = [ 265 libs = [
(...skipping 20 matching lines...) Expand all
284 embedded_services = [ 286 embedded_services = [
285 ":unittests_manifest", 287 ":unittests_manifest",
286 ":interactive_ui_tests_manifest", 288 ":interactive_ui_tests_manifest",
287 ] 289 ]
288 290
289 standalone_services = [ "//services/ui/test_wm:manifest" ] 291 standalone_services = [ "//services/ui/test_wm:manifest" ]
290 292
291 catalog_deps = [ "//mash:catalog" ] 293 catalog_deps = [ "//mash:catalog" ]
292 } 294 }
293 295
294 catalog_cpp_source("views_mus_tests_catalog_source") { 296 copy("views_mus_tests_catalog_copy") {
295 testonly = true 297 testonly = true
296 catalog = ":views_mus_tests_catalog" 298 sources = get_target_outputs(":views_mus_tests_catalog")
297 output_symbol_name = "kViewsMusTestCatalog" 299 outputs = [
300 "${root_out_dir}/views_mus_tests_catalog.json",
301 ]
302 deps = [
303 ":views_mus_tests_catalog",
304 ]
298 } 305 }
OLDNEW
« no previous file with comments | « no previous file | ui/views/mus/views_mus_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698