Skip to content

Commit

Permalink
Remove extensions_tests.gyp[i]
Browse files Browse the repository at this point in the history 
Inlines sources into the GN build files. This creates smaller helper "unit_tests" and "browser_tests" targets for the various subdirectories to keep the file lists closer to the code.

Adds the wifi display unit tests which were missing from the GN build (these are not compiled by default, only when you explicitly pass a flag).

Adds the new targets to GN check and adds additional dependencies to make this check pass.

Review-Url: https://codereview.chromium.org/2281053004
Cr-Commit-Position: refs/heads/master@{#415419}
  • Loading branch information
brettw authored and Commit bot committed Aug 30, 2016
1 parent 5cdf584 commit dc1e618
Show file tree
Hide file tree
Showing 14 changed files with 380 additions and 435 deletions.
8 changes: 8 additions & 0 deletions .gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ check_targets = [
"//device/*",

#"//extensions/*", # Lots of errors.
"//extensions:extensions_unittests",
"//extensions/browser:browser_tests",
"//extensions/browser:unit_tests",
"//extensions/common:unit_tests",
"//extensions/renderer:unit_tests",
"//extensions/shell:browser_tests",
"//extensions/shell:unit_tests",
"//extensions/utility:unit_tests",
"//gin/*",
"//google_apis/*",
"//google_update/*",
Expand Down
2 changes: 1 addition & 1 deletion device/serial/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static_library("test_support") {
"test_serial_io_handler.h",
]

deps = [
public_deps = [
":serial",
]
}
Expand Down
95 changes: 13 additions & 82 deletions extensions/BUILD.gn
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand All @@ -12,7 +11,6 @@ import("//tools/grit/repack.gni")

assert(enable_extensions)

# GYP version: extensions/extensions_resources.gyp:extensions_resources
group("extensions_resources") {
public_deps = [
":extensions_browser_resources",
Expand All @@ -21,8 +19,6 @@ group("extensions_resources") {
]
}

# GYP version: extensions/extensions_resources.gyp:extensions_resources
# (extensions_resources action)
grit("extensions_resources_grd") {
source = "extensions_resources.grd"
outputs = [
Expand All @@ -31,8 +27,6 @@ grit("extensions_resources_grd") {
]
}

# GYP version: extensions/extensions_resources.gyp:extensions_resources
# (extensions_browser_resources action)
grit("extensions_browser_resources") {
source = "browser/resources/extensions_browser_resources.grd"
outputs = [
Expand All @@ -48,8 +42,6 @@ grit("extensions_browser_resources") {
]
}

# GYP version: extensions/extensions_resources.gyp:extensions_resources
# (extensions_renderer_resources action)
grit("extensions_renderer_resources") {
source = "renderer/resources/extensions_renderer_resources.grd"
outputs = [
Expand Down Expand Up @@ -104,7 +96,6 @@ static_library("test_support") {
]
}

# GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak
repack("shell_and_test_pak") {
sources = [
"$root_gen_dir/blink/devtools_resources.pak",
Expand Down Expand Up @@ -141,19 +132,10 @@ repack("shell_and_test_pak") {
}

test("extensions_unittests") {
sources =
rebase_path(extensions_tests_gypi_values.extensions_unittests_sources,
".",
"//extensions")

sources += [
# TODO(rockot): DisplayInfoProvider::Create() is only implemented in Chrome
# and app_shell. This is wrong.
"shell/browser/shell_display_info_provider.cc",
sources = [
"test/extensions_unittests_main.cc",
]

configs += [ "//build/config:precompiled_headers" ]

data = [
"test/data/",
"//chrome/test/data/extensions/",
Expand All @@ -166,94 +148,43 @@ test("extensions_unittests") {
":extensions_resources",
":shell_and_test_pak",
":test_support",
"//base",
"//base/test:test_support",
"//components/keyed_service/content",
"//components/pref_registry:test_support",
"//components/prefs:test_support",
"//components/user_prefs",
"//content/public/common",
"//content/test:test_support",
"//device/bluetooth:mocks",
"//device/core",
"//device/hid",
"//device/serial",
"//device/serial:test_support",
"//extensions/browser:unit_tests",
"//extensions/common",
"//extensions/common/api/cast_channel:cast_channel_proto",
"//extensions/renderer",
"//extensions/strings",
"//extensions/utility",
"//mojo/edk/js",
"//extensions/common:unit_tests",
"//extensions/renderer:unit_tests",
"//extensions/shell:unit_tests",
"//extensions/utility:unit_tests",
"//mojo/edk/system",
"//mojo/public/cpp/bindings",
"//services/shell/public/interfaces",
"//testing/gmock",
"//testing/gtest",
"//third_party/leveldatabase",
"//mojo/edk/test:test_support",
"//ui/gl:test_support",
]

data_deps = [
"//third_party/mesa:osmesa",
]

if (is_chromeos) {
sources += [
"browser/api/webcam_private/visca_webcam_unittest.cc",

# TODO(rockot): There are two implementations of VpnServiceFactory, a
# stub in app_shell and a real one in Chrome. This is wrong.
"shell/browser/api/vpn_provider/vpn_service_factory.cc",
]

deps += [ "//chromeos:test_support" ]
}
}

test("extensions_browsertests") {
sources =
rebase_path(extensions_tests_gypi_values.extensions_browsertests_sources,
".",
"//extensions")

data = [
"test/data/",
"//extensions/test/data/",
"//net/tools/testserver/",
"//third_party/pyftpdlib/",
"//third_party/pywebsocket/",
"//third_party/tlslite/",
"$root_out_dir/extensions_shell_and_test.pak",
]

defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]

deps = [
":test_support",
"shell:app_shell_lib",

# TODO(yoz): find the right deps
"//base",
"//base/test:test_support",
"//components/prefs:test_support",
"//components/storage_monitor:test_support",
"//content/test:test_support",
"//device/bluetooth:mocks",
"//device/core:mocks",
"//device/hid:mocks",
"//device/usb:test_support",
"//mojo/edk/js",
"//mojo/public/cpp/bindings",
"//net:test_support",
"//testing/gmock",
"//testing/gtest",
"//extensions/browser:browser_tests",
"//extensions/shell:browser_tests",
]

data_deps = [
"//third_party/mesa:osmesa",
]

if (is_mac) {
deps += [ "shell:app_shell" ] # Needed for App Shell.app's Helper.
}
}

# TODO(rockot) bug 505926: These should be moved to extensions_browsertests but have
Expand Down
166 changes: 166 additions & 0 deletions extensions/browser/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ source_set("browser") {
"//device/power_save_blocker",
"//device/serial",
"//device/usb",
"//extensions:extensions_browser_resources",
"//extensions/common/api/cast_channel:cast_channel_proto",
]

Expand Down Expand Up @@ -115,3 +116,168 @@ source_set("browser") {
}
}
}

source_set("browser_tests") {
testonly = true
sources = [
"api/audio/audio_apitest.cc",
"api/bluetooth_socket/bluetooth_socket_apitest.cc",
"api/display_source/display_source_apitest.cc",
"api/display_source/display_source_apitestbase.cc",
"api/display_source/display_source_apitestbase.h",
"api/dns/dns_apitest.cc",
"api/hid/hid_apitest.cc",
"api/printer_provider/printer_provider_apitest.cc",
"api/socket/socket_apitest.cc",
"api/sockets_tcp/sockets_tcp_apitest.cc",
"api/sockets_tcp_server/sockets_tcp_server_apitest.cc",
"api/sockets_udp/sockets_udp_apitest.cc",
"api/system_cpu/system_cpu_apitest.cc",
"api/system_display/system_display_apitest.cc",
"api/system_memory/system_memory_apitest.cc",
"api/system_network/system_network_apitest.cc",
"api/system_storage/storage_api_test_util.cc",
"api/system_storage/storage_api_test_util.h",
"api/system_storage/system_storage_apitest.cc",
"api/system_storage/system_storage_eject_apitest.cc",
"api/usb/usb_apitest.cc",
"guest_view/app_view/app_view_apitest.cc",
"guest_view/web_view/web_view_apitest.cc",
"guest_view/web_view/web_view_apitest.h",
"guest_view/web_view/web_view_media_access_apitest.cc",
]

defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]

deps = [
":browser",
"//base",
"//components/guest_view/browser:test_support",
"//components/storage_monitor:test_support",
"//content/test:test_support",
"//device/bluetooth:mocks",
"//device/core:mocks",
"//device/hid:mocks",
"//device/usb:test_support",
"//extensions:test_support",
"//extensions/common",
"//extensions/common/api",
"//extensions/shell:app_shell_lib",
"//extensions/shell:browser_tests",
"//net:test_support",
]

if (is_mac) {
# Needed for App Shell.app's Helper.
deps += [ "//extensions/shell:app_shell" ]
}
if (is_chromeos) {
deps += [ "//chromeos" ]
}
}

source_set("unit_tests") {
testonly = true
sources = [
"api/alarms/alarms_api_unittest.cc",
"api/api_resource_manager_unittest.cc",
"api/bluetooth/bluetooth_event_router_unittest.cc",
"api/cast_channel/cast_auth_util_unittest.cc",
"api/cast_channel/cast_channel_api_unittest.cc",
"api/cast_channel/cast_framer_unittest.cc",
"api/cast_channel/cast_socket_unittest.cc",
"api/cast_channel/cast_transport_unittest.cc",
"api/cast_channel/keep_alive_delegate_unittest.cc",
"api/cast_channel/logger_unittest.cc",
"api/declarative/declarative_rule_unittest.cc",
"api/declarative/deduping_factory_unittest.cc",
"api/declarative/rules_registry_unittest.cc",
"api/declarative_webrequest/webrequest_condition_attribute_unittest.cc",
"api/declarative_webrequest/webrequest_condition_unittest.cc",
"api/device_permissions_prompt_unittest.cc",
"api/document_scan/document_scan_api_unittest.cc",
"api/document_scan/document_scan_interface_chromeos_unittest.cc",
"api/document_scan/mock_document_scan_interface.cc",
"api/idle/idle_api_unittest.cc",
"api/mime_handler_private/mime_handler_private_unittest.cc",
"api/networking_config/networking_config_service_chromeos_unittest.cc",
"api/power/power_api_unittest.cc",
"api/runtime/restart_after_delay_api_unittest.cc",
"api/sockets_tcp/sockets_tcp_api_unittest.cc",
"api/sockets_udp/sockets_udp_api_unittest.cc",
"api/storage/settings_quota_unittest.cc",
"api/storage/storage_api_unittest.cc",
"api/storage/storage_frontend_unittest.cc",
"api/web_request/form_data_parser_unittest.cc",
"api/web_request/upload_data_presenter_unittest.cc",
"api/web_request/web_request_time_tracker_unittest.cc",
"app_window/app_window_geometry_cache_unittest.cc",
"computed_hashes_unittest.cc",
"content_hash_tree_unittest.cc",
"error_map_unittest.cc",
"event_listener_map_unittest.cc",
"event_router_unittest.cc",
"extension_api_frame_id_map_unittest.cc",
"extension_icon_image_unittest.cc",
"extension_pref_value_map_unittest.cc",
"extension_registry_unittest.cc",
"extension_throttle_simulation_unittest.cc",
"extension_throttle_test_support.cc",
"extension_throttle_test_support.h",
"extension_throttle_unittest.cc",
"file_highlighter_unittest.cc",
"file_reader_unittest.cc",
"image_loader_unittest.cc",
"info_map_unittest.cc",
"lazy_background_task_queue_unittest.cc",
"load_monitoring_extension_host_queue_unittest.cc",
"management_policy_unittest.cc",
"mojo/keep_alive_impl_unittest.cc",
"mojo/stash_backend_unittest.cc",
"process_manager_unittest.cc",
"process_map_unittest.cc",
"quota_service_unittest.cc",
"runtime_data_unittest.cc",
"sandboxed_unpacker_unittest.cc",
"updater/update_service_unittest.cc",
"value_store/leveldb_scoped_database_unittest.cc",
"value_store/leveldb_value_store_unittest.cc",
"value_store/testing_value_store_unittest.cc",
"value_store/value_store_change_unittest.cc",
"value_store/value_store_frontend_unittest.cc",
"value_store/value_store_unittest.cc",
"value_store/value_store_unittest.h",
"verified_contents_unittest.cc",
"warning_service_unittest.cc",
]

deps = [
":browser",
"//base",
"//base/test:test_support",
"//components/cast_certificate:test_support",
"//components/crx_file",
"//components/keyed_service/content",
"//components/pref_registry:test_support",
"//components/prefs:test_support",
"//components/update_client",
"//components/url_matcher",
"//components/user_prefs",
"//content/test:test_support",
"//device/bluetooth:mocks",
"//device/power_save_blocker",
"//extensions:extensions_browser_resources",
"//extensions:test_support",
"//extensions/common",
"//extensions/common/api",
"//ipc:test_support",
"//net:test_support",
"//third_party/leveldatabase",
"//third_party/zlib:zip",
]

if (is_chromeos) {
sources += [ "api/webcam_private/visca_webcam_unittest.cc" ]
deps += [ "//chromeos:test_support" ]
}
}
Loading

0 comments on commit dc1e618

Please sign in to comment.