Commit 7d6ec246 authored by brettw's avatar brettw Committed by Commit bot

Add browser_tests to the GN build.

Other misc fixes including:

Add "data_deps" to the templates in BUILDCONFIG. This was renamed from "datadeps" a while ago but both are still supported.

extension_management_test_util.cc includes a generated file policy_constants. GYP generates this with an extra "policy" directory but GN doesn't. The way GYP has the dirs set up, though, using only one "policy" works (and this is what other files do) so I just changed the include.

TBR=dpranke

Review URL: https://codereview.chromium.org/824373003

Cr-Commit-Position: refs/heads/master@{#310276}
parent c76ec5ee
...@@ -561,6 +561,9 @@ template("component") { ...@@ -561,6 +561,9 @@ template("component") {
if (defined(invoker.data)) { if (defined(invoker.data)) {
data = invoker.data data = invoker.data
} }
if (defined(invoker.data_deps)) {
data_deps = invoker.data_deps
}
if (defined(invoker.datadeps)) { if (defined(invoker.datadeps)) {
datadeps = invoker.datadeps datadeps = invoker.datadeps
} }
...@@ -656,6 +659,9 @@ template("component") { ...@@ -656,6 +659,9 @@ template("component") {
if (defined(invoker.data)) { if (defined(invoker.data)) {
data = invoker.data data = invoker.data
} }
if (defined(invoker.data_deps)) {
data_deps = invoker.data_deps
}
if (defined(invoker.datadeps)) { if (defined(invoker.datadeps)) {
datadeps = invoker.datadeps datadeps = invoker.datadeps
} }
...@@ -758,6 +764,9 @@ template("test") { ...@@ -758,6 +764,9 @@ template("test") {
if (defined(invoker.data)) { if (defined(invoker.data)) {
data = invoker.data data = invoker.data
} }
if (defined(invoker.data_deps)) {
data_deps = invoker.data_deps
}
if (defined(invoker.datadeps)) { if (defined(invoker.datadeps)) {
datadeps = invoker.datadeps datadeps = invoker.datadeps
} }
...@@ -845,6 +854,9 @@ template("test") { ...@@ -845,6 +854,9 @@ template("test") {
if (defined(invoker.data)) { if (defined(invoker.data)) {
data = invoker.data data = invoker.data
} }
if (defined(invoker.data_deps)) {
data_deps = invoker.data_deps
}
if (defined(invoker.datadeps)) { if (defined(invoker.datadeps)) {
datadeps = invoker.datadeps datadeps = invoker.datadeps
} }
......
...@@ -959,14 +959,8 @@ source_set("test_support") { ...@@ -959,14 +959,8 @@ source_set("test_support") {
"chromeos/login/fake_login_utils.h", "chromeos/login/fake_login_utils.h",
"chromeos/login/mock_login_utils.cc", "chromeos/login/mock_login_utils.cc",
"chromeos/login/mock_login_utils.h", "chromeos/login/mock_login_utils.h",
"chromeos/login/users/avatar/mock_user_image_manager.cc", "chromeos/login/screens/mock_device_disabled_screen_actor.cc",
"chromeos/login/users/avatar/mock_user_image_manager.h", "chromeos/login/screens/mock_device_disabled_screen_actor.h",
"chromeos/login/users/fake_supervised_user_manager.cc",
"chromeos/login/users/fake_supervised_user_manager.h",
"chromeos/login/users/fake_user_manager.cc",
"chromeos/login/users/fake_user_manager.h",
"chromeos/login/users/mock_user_manager.cc",
"chromeos/login/users/mock_user_manager.h",
"chromeos/login/test/oobe_screen_waiter.cc", "chromeos/login/test/oobe_screen_waiter.cc",
"chromeos/login/test/oobe_screen_waiter.h", "chromeos/login/test/oobe_screen_waiter.h",
"chromeos/login/test/js_checker.cc", "chromeos/login/test/js_checker.cc",
...@@ -975,6 +969,14 @@ source_set("test_support") { ...@@ -975,6 +969,14 @@ source_set("test_support") {
"chromeos/login/ui/mock_login_display.h", "chromeos/login/ui/mock_login_display.h",
"chromeos/login/ui/mock_login_display_host.cc", "chromeos/login/ui/mock_login_display_host.cc",
"chromeos/login/ui/mock_login_display_host.h", "chromeos/login/ui/mock_login_display_host.h",
"chromeos/login/users/avatar/mock_user_image_manager.cc",
"chromeos/login/users/avatar/mock_user_image_manager.h",
"chromeos/login/users/fake_supervised_user_manager.cc",
"chromeos/login/users/fake_supervised_user_manager.h",
"chromeos/login/users/fake_user_manager.cc",
"chromeos/login/users/fake_user_manager.h",
"chromeos/login/users/mock_user_manager.cc",
"chromeos/login/users/mock_user_manager.h",
"chromeos/net/network_portal_detector_test_utils.cc", "chromeos/net/network_portal_detector_test_utils.cc",
"chromeos/net/network_portal_detector_test_utils.h", "chromeos/net/network_portal_detector_test_utils.h",
"chromeos/policy/cloud_external_data_manager_base_test_util.cc", "chromeos/policy/cloud_external_data_manager_base_test_util.cc",
...@@ -1032,6 +1034,8 @@ source_set("test_support") { ...@@ -1032,6 +1034,8 @@ source_set("test_support") {
"extensions/test_blacklist_state_fetcher.h", "extensions/test_blacklist_state_fetcher.h",
"extensions/test_extension_environment.cc", "extensions/test_extension_environment.cc",
"extensions/test_extension_environment.h", "extensions/test_extension_environment.h",
"extensions/test_extension_dir.cc",
"extensions/test_extension_dir.h",
"extensions/test_extension_prefs.cc", "extensions/test_extension_prefs.cc",
"extensions/test_extension_prefs.h", "extensions/test_extension_prefs.h",
"extensions/test_extension_service.cc", "extensions/test_extension_service.cc",
...@@ -1055,6 +1059,8 @@ source_set("test_support") { ...@@ -1055,6 +1059,8 @@ source_set("test_support") {
sources += [ sources += [
"ui/app_list/test/chrome_app_list_test_support.cc", "ui/app_list/test/chrome_app_list_test_support.cc",
"ui/app_list/test/chrome_app_list_test_support.h", "ui/app_list/test/chrome_app_list_test_support.h",
"ui/app_list/test/test_app_list_controller_delegate.cc",
"ui/app_list/test/test_app_list_controller_delegate.h",
] ]
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_map.h"
#include "components/policy/core/common/policy_namespace.h" #include "components/policy/core/common/policy_namespace.h"
#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/policy_types.h"
#include "policy/policy/policy_constants.h" #include "policy/policy_constants.h"
namespace extensions { namespace extensions {
......
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
'browser/browsing_data/browsing_data_remover_browsertest.cc', 'browser/browsing_data/browsing_data_remover_browsertest.cc',
'browser/browsing_data/browsing_data_remover_test_util.cc', 'browser/browsing_data/browsing_data_remover_test_util.cc',
'browser/browsing_data/browsing_data_remover_test_util.h', 'browser/browsing_data/browsing_data_remover_test_util.h',
'browser/captive_portal/captive_portal_browsertest.cc',
'browser/chrome_content_browser_client_browsertest.cc', 'browser/chrome_content_browser_client_browsertest.cc',
'browser/chrome_main_browsertest.cc', 'browser/chrome_main_browsertest.cc',
'browser/chrome_plugin_browsertest.cc', 'browser/chrome_plugin_browsertest.cc',
...@@ -491,25 +490,6 @@ ...@@ -491,25 +490,6 @@
'browser/ui/toolbar/browser_actions_bar_browsertest.h', 'browser/ui/toolbar/browser_actions_bar_browsertest.h',
'browser/ui/toolbar/test_toolbar_model.cc', 'browser/ui/toolbar/test_toolbar_model.cc',
'browser/ui/toolbar/test_toolbar_model.h', 'browser/ui/toolbar/test_toolbar_model.h',
'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc',
'browser/ui/views/autofill/autofill_dialog_view_tester_views.h',
'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc',
'browser/ui/views/autofill/password_generation_popup_view_tester_views.cc',
'browser/ui/views/autofill/password_generation_popup_view_tester_views.h',
'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
'browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc',
'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
'browser/ui/views/frame/browser_view_browsertest.cc',
'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc',
'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
'browser/ui/views/select_file_dialog_extension_browsertest.cc',
'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
'browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc',
'browser/ui/views/toolbar/toolbar_view_browsertest.cc',
'browser/ui/views/translate/translate_bubble_view_browsertest.cc',
'browser/ui/views/web_dialog_view_browsertest.cc',
'browser/ui/webui/bidi_checker_web_ui_test.cc', 'browser/ui/webui/bidi_checker_web_ui_test.cc',
'browser/ui/webui/bidi_checker_web_ui_test.h', 'browser/ui/webui/bidi_checker_web_ui_test.h',
'browser/ui/webui/bookmarks_ui_browsertest.cc', 'browser/ui/webui/bookmarks_ui_browsertest.cc',
...@@ -587,6 +567,27 @@ ...@@ -587,6 +567,27 @@
# is safe to run there. See http://crbug.com/78722 for details. # is safe to run there. See http://crbug.com/78722 for details.
'../base/files/file_path_watcher_browsertest.cc', '../base/files/file_path_watcher_browsertest.cc',
], ],
'chrome_browser_tests_views_sources': [
'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc',
'browser/ui/views/autofill/autofill_dialog_view_tester_views.h',
'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc',
'browser/ui/views/autofill/password_generation_popup_view_tester_views.cc',
'browser/ui/views/autofill/password_generation_popup_view_tester_views.h',
'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
'browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc',
'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
'browser/ui/views/frame/browser_view_browsertest.cc',
'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc',
'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
'browser/ui/views/select_file_dialog_extension_browsertest.cc',
'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
'browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc',
'browser/ui/views/toolbar/toolbar_view_browsertest.cc',
'browser/ui/views/translate/translate_bubble_view_browsertest.cc',
'browser/ui/views/web_dialog_view_browsertest.cc',
],
'chrome_browser_tests_chromeos_sources': [ 'chrome_browser_tests_chromeos_sources': [
'browser/chromeos/accessibility/accessibility_manager_browsertest.cc', 'browser/chromeos/accessibility/accessibility_manager_browsertest.cc',
'browser/chromeos/accessibility/magnification_manager_browsertest.cc', 'browser/chromeos/accessibility/magnification_manager_browsertest.cc',
...@@ -2161,10 +2162,8 @@ ...@@ -2161,10 +2162,8 @@
'FULL_SAFE_BROWSING', 'FULL_SAFE_BROWSING',
], ],
}], }],
['enable_captive_portal_detection!=1', { ['enable_captive_portal_detection==1', {
'sources/': [ 'sources': [ 'browser/captive_portal/captive_portal_browsertest.cc' ],
['exclude', '^browser/captive_portal/'],
],
}], }],
['enable_webrtc==0', { ['enable_webrtc==0', {
'sources!': [ 'sources!': [
...@@ -2207,13 +2206,11 @@ ...@@ -2207,13 +2206,11 @@
# ash environment to run these unit tests. # ash environment to run these unit tests.
# #
# TODO: enable these on windows and linux. # TODO: enable these on windows and linux.
'browser/chromeos/system/tray_accessibility_browsertest.cc',
'browser/ui/ash/accelerator_commands_browsertest.cc', 'browser/ui/ash/accelerator_commands_browsertest.cc',
'browser/ui/ash/accelerator_controller_browsertest.cc', 'browser/ui/ash/accelerator_controller_browsertest.cc',
'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc', 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
'browser/ui/ash/shelf_browsertest.cc', 'browser/ui/ash/shelf_browsertest.cc',
'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc',
'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc', 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
], ],
}], }],
...@@ -2282,9 +2279,14 @@ ...@@ -2282,9 +2279,14 @@
}], # OS=="mac" }], # OS=="mac"
['OS=="mac" or OS=="win"', { ['OS=="mac" or OS=="win"', {
'sources': [ 'sources': [
'browser/extensions/api/networking_private/networking_private_apitest.cc',
'browser/extensions/api/networking_private/networking_private_service_client_apitest.cc',
'browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc', 'browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc',
'browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc', 'browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc',
], ],
'dependencies': [
'../components/components.gyp:wifi_test_support',
],
}], }],
['os_posix == 0 or chromeos == 1', { ['os_posix == 0 or chromeos == 1', {
'sources!': [ 'sources!': [
...@@ -2307,32 +2309,17 @@ ...@@ -2307,32 +2309,17 @@
}], }],
], ],
}], }],
['OS=="win" or OS == "mac"', {
'dependencies': [
'../components/components.gyp:wifi_test_support',
],
}],
['chromeos == 1 and use_athena == 0', { ['chromeos == 1 and use_athena == 0', {
'sources': [ 'sources': [
'browser/extensions/api/networking_private/networking_private_apitest.cc', 'browser/extensions/api/networking_private/networking_private_apitest.cc',
'browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc', 'browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc',
], ],
}], }],
['OS=="win" or OS == "mac"', {
'sources': [
'browser/extensions/api/networking_private/networking_private_apitest.cc',
'browser/extensions/api/networking_private/networking_private_service_client_apitest.cc',
],
}],
['toolkit_views==1', { ['toolkit_views==1', {
'sources': [ '<@(chrome_browser_tests_views_sources)' ],
'dependencies': [ 'dependencies': [
'../ui/views/views.gyp:views', '../ui/views/views.gyp:views',
], ],
}, { # else: toolkit_views == 0
'sources/': [
['exclude', '^../ui/views/'],
['exclude', '^browser/ui/views/'],
],
}], }],
['OS!="android" and OS!="ios" and use_athena==0', { ['OS!="android" and OS!="ios" and use_athena==0', {
'sources': [ 'sources': [
......
...@@ -1874,7 +1874,7 @@ ...@@ -1874,7 +1874,7 @@
'browser/ui/app_list/test/chrome_app_list_test_support.cc', 'browser/ui/app_list/test/chrome_app_list_test_support.cc',
'browser/ui/app_list/test/chrome_app_list_test_support.h', 'browser/ui/app_list/test/chrome_app_list_test_support.h',
'browser/ui/app_list/test/test_app_list_controller_delegate.cc', 'browser/ui/app_list/test/test_app_list_controller_delegate.cc',
'browser/ui/app_list/test/test_app_list_controller_delegate.cc', 'browser/ui/app_list/test/test_app_list_controller_delegate.h',
], ],
}], }],
['enable_webrtc==1', { ['enable_webrtc==1', {
......
This diff is collapsed.
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
{ {
'targets': [ 'targets': [
{ {
# GN version: //chrome/test/perf
'target_name': 'chrome_perf_test', 'target_name': 'chrome_perf_test',
'type': 'static_library', 'type': 'static_library',
'sources': [ 'sources': [
......
...@@ -52,9 +52,7 @@ static_library("serial") { ...@@ -52,9 +52,7 @@ static_library("serial") {
} }
# GYP version: device/serial/serial.gyp:device_serial_test_util # GYP version: device/serial/serial.gyp:device_serial_test_util
static_library("test_util") { static_library("test_support") {
output_name = "device_serial_test_util"
sources = [ sources = [
"test_serial_io_handler.cc", "test_serial_io_handler.cc",
"test_serial_io_handler.h", "test_serial_io_handler.h",
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
], ],
}, },
{ {
# GN version: //device/serial:test_util # GN version: //device/serial:test_support
'target_name': 'device_serial_test_util', 'target_name': 'device_serial_test_util',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
......
...@@ -74,8 +74,12 @@ source_set("test_support") { ...@@ -74,8 +74,12 @@ source_set("test_support") {
"browser/api_unittest.h", "browser/api_unittest.h",
"browser/extensions_test.cc", "browser/extensions_test.cc",
"browser/extensions_test.h", "browser/extensions_test.h",
"browser/guest_view/test_guest_view_manager.cc",
"browser/guest_view/test_guest_view_manager.h",
"browser/mock_extension_system.cc", "browser/mock_extension_system.cc",
"browser/mock_extension_system.h", "browser/mock_extension_system.h",
"browser/test_extension_registry_observer.cc",
"browser/test_extension_registry_observer.h",
"browser/test_extensions_browser_client.cc", "browser/test_extensions_browser_client.cc",
"browser/test_extensions_browser_client.h", "browser/test_extensions_browser_client.h",
"browser/test_management_policy.cc", "browser/test_management_policy.cc",
......
...@@ -82,6 +82,8 @@ source_set("audio") { ...@@ -82,6 +82,8 @@ source_set("audio") {
"audio_power_monitor.cc", "audio_power_monitor.cc",
"audio_power_monitor.h", "audio_power_monitor.h",
"audio_source_diverter.h", "audio_source_diverter.h",
"clockless_audio_sink.cc",
"clockless_audio_sink.h",
"fake_audio_consumer.cc", "fake_audio_consumer.cc",
"fake_audio_consumer.h", "fake_audio_consumer.h",
"fake_audio_input_stream.cc", "fake_audio_input_stream.cc",
...@@ -246,8 +248,6 @@ source_set("audio") { ...@@ -246,8 +248,6 @@ source_set("audio") {
source_set("test_support") { source_set("test_support") {
testonly = true testonly = true
sources = [ sources = [
"clockless_audio_sink.cc",
"clockless_audio_sink.h",
"mock_audio_manager.cc", "mock_audio_manager.cc",
"mock_audio_manager.h", "mock_audio_manager.h",
"mock_audio_source_callback.cc", "mock_audio_source_callback.cc",
......
...@@ -1415,7 +1415,8 @@ ...@@ -1415,7 +1415,8 @@
], ],
}, },
{ {
# GN version: //media:test_support # GN versions (it is split apart): //media:test_support,
# //media/base:test_support, and //media/audio:test_support
'target_name': 'media_test_support', 'target_name': 'media_test_support',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
......
...@@ -22,15 +22,19 @@ static_library("sdch") { ...@@ -22,15 +22,19 @@ static_library("sdch") {
"open-vcdiff/src/encodetable.h", "open-vcdiff/src/encodetable.h",
"open-vcdiff/src/google/output_string.h", "open-vcdiff/src/google/output_string.h",
"open-vcdiff/src/google/vcdecoder.h", "open-vcdiff/src/google/vcdecoder.h",
"open-vcdiff/src/google/vcencoder.h",
"open-vcdiff/src/headerparser.cc", "open-vcdiff/src/headerparser.cc",
"open-vcdiff/src/headerparser.h", "open-vcdiff/src/headerparser.h",
"open-vcdiff/src/instruction_map.cc", "open-vcdiff/src/instruction_map.cc",
"open-vcdiff/src/instruction_map.h", "open-vcdiff/src/instruction_map.h",
"open-vcdiff/src/jsonwriter.h",
"open-vcdiff/src/jsonwriter.cc",
"open-vcdiff/src/rolling_hash.h", "open-vcdiff/src/rolling_hash.h",
"open-vcdiff/src/testing.h", "open-vcdiff/src/testing.h",
"open-vcdiff/src/varint_bigendian.cc", "open-vcdiff/src/varint_bigendian.cc",
"open-vcdiff/src/varint_bigendian.h", "open-vcdiff/src/varint_bigendian.h",
"open-vcdiff/src/vcdecoder.cc", "open-vcdiff/src/vcdecoder.cc",
"open-vcdiff/src/vcencoder.cc",
"open-vcdiff/src/vcdiff_defs.h", "open-vcdiff/src/vcdiff_defs.h",
"open-vcdiff/src/vcdiffengine.cc", "open-vcdiff/src/vcdiffengine.cc",
"open-vcdiff/src/vcdiffengine.h", "open-vcdiff/src/vcdiffengine.h",
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
source_set("perf") { source_set("perf") {
sources = [ sources = [
"perf_test.cc", "perf_test.cc",
"perf_test.h",
] ]
deps = [ deps = [
"//base", "//base",
......
# Copyright 2015 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.
source_set("test_support") {
testonly = true
data = [
"testing/external_test_pb2.py",
"testing/safebrowsing_test_server.py",
"testing/testing_input.dat",
]
}
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
{ {
'targets': [ 'targets': [
{ {
# GN version: //third_party/safe_browsing:test_support
'target_name': 'safe_browsing', 'target_name': 'safe_browsing',
'type': 'none', 'type': 'none',
'sources': [ 'sources': [
......
...@@ -96,6 +96,7 @@ source_set("widevine_test_license_server") { ...@@ -96,6 +96,7 @@ source_set("widevine_test_license_server") {
if (is_chrome_branded && is_linux) { if (is_chrome_branded && is_linux) {
deps = [ deps = [
# TODO(GYP) # TODO(GYP)
# This target should be removed and targets should have datadeps on this target:
#"//third_party/widevine/test/license_server/license_server.gyp:test_license_server" #"//third_party/widevine/test/license_server/license_server.gyp:test_license_server"
] ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment