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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_shell.gypi

Issue 1167703002: Move test runner to a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 5 years, 7 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 | « components/test_runner/web_test_runner.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index a2bb518d64bdf2e558201b6889deebd865594932..475008a34a016c5d7b7a16e881beb1fee127c03b 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -51,6 +51,7 @@
'../components/components.gyp:devtools_http_handler',
'../components/components.gyp:web_cache_renderer',
'../components/components.gyp:plugins_renderer',
+ '../components/test_runner/test_runner.gyp:test_runner',
'../device/bluetooth/bluetooth.gyp:device_bluetooth',
'../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
'../gin/gin.gyp:gin',
@@ -205,8 +206,6 @@
'shell/common/shell_switches.h',
'shell/common/shell_test_configuration.cc',
'shell/common/shell_test_configuration.h',
- 'shell/common/test_runner/test_preferences.cc',
- 'shell/common/test_runner/test_preferences.h',
'shell/common/v8_breakpad_support_win.cc',
'shell/common/v8_breakpad_support_win.h',
'shell/renderer/ipc_echo.cc',
@@ -235,69 +234,6 @@
'shell/renderer/shell_content_renderer_client.h',
'shell/renderer/shell_render_view_observer.cc',
'shell/renderer/shell_render_view_observer.h',
- 'shell/renderer/test_runner/accessibility_controller.cc',
- 'shell/renderer/test_runner/accessibility_controller.h',
- 'shell/renderer/test_runner/app_banner_client.cc',
- 'shell/renderer/test_runner/app_banner_client.h',
- 'shell/renderer/test_runner/event_sender.cc',
- 'shell/renderer/test_runner/event_sender.h',
- 'shell/renderer/test_runner/gamepad_controller.cc',
- 'shell/renderer/test_runner/gamepad_controller.h',
- 'shell/renderer/test_runner/mock_color_chooser.cc',
- 'shell/renderer/test_runner/mock_color_chooser.h',
- 'shell/renderer/test_runner/mock_constraints.cc',
- 'shell/renderer/test_runner/mock_constraints.h',
- 'shell/renderer/test_runner/mock_credential_manager_client.cc',
- 'shell/renderer/test_runner/mock_credential_manager_client.h',
- 'shell/renderer/test_runner/mock_grammar_check.cc',
- 'shell/renderer/test_runner/mock_grammar_check.h',
- 'shell/renderer/test_runner/mock_screen_orientation_client.cc',
- 'shell/renderer/test_runner/mock_screen_orientation_client.h',
- 'shell/renderer/test_runner/mock_spell_check.cc',
- 'shell/renderer/test_runner/mock_spell_check.h',
- 'shell/renderer/test_runner/mock_web_audio_device.cc',
- 'shell/renderer/test_runner/mock_web_audio_device.h',
- 'shell/renderer/test_runner/mock_web_media_stream_center.cc',
- 'shell/renderer/test_runner/mock_web_media_stream_center.h',
- 'shell/renderer/test_runner/mock_web_midi_accessor.cc',
- 'shell/renderer/test_runner/mock_web_midi_accessor.h',
- 'shell/renderer/test_runner/mock_web_speech_recognizer.cc',
- 'shell/renderer/test_runner/mock_web_speech_recognizer.h',
- 'shell/renderer/test_runner/mock_web_theme_engine.cc',
- 'shell/renderer/test_runner/mock_web_theme_engine.h',
- 'shell/renderer/test_runner/mock_web_user_media_client.cc',
- 'shell/renderer/test_runner/mock_web_user_media_client.h',
- 'shell/renderer/test_runner/mock_webrtc_data_channel_handler.cc',
- 'shell/renderer/test_runner/mock_webrtc_data_channel_handler.h',
- 'shell/renderer/test_runner/mock_webrtc_dtmf_sender_handler.cc',
- 'shell/renderer/test_runner/mock_webrtc_dtmf_sender_handler.h',
- 'shell/renderer/test_runner/mock_webrtc_peer_connection_handler.cc',
- 'shell/renderer/test_runner/mock_webrtc_peer_connection_handler.h',
- 'shell/renderer/test_runner/spell_check_client.cc',
- 'shell/renderer/test_runner/spell_check_client.h',
- 'shell/renderer/test_runner/test_common.cc',
- 'shell/renderer/test_runner/test_common.h',
- 'shell/renderer/test_runner/test_interfaces.cc',
- 'shell/renderer/test_runner/test_interfaces.h',
- 'shell/renderer/test_runner/test_plugin.cc',
- 'shell/renderer/test_runner/test_plugin.h',
- 'shell/renderer/test_runner/test_runner.cc',
- 'shell/renderer/test_runner/test_runner.h',
- 'shell/renderer/test_runner/text_input_controller.cc',
- 'shell/renderer/test_runner/text_input_controller.h',
- 'shell/renderer/test_runner/web_ax_object_proxy.cc',
- 'shell/renderer/test_runner/web_ax_object_proxy.h',
- 'shell/renderer/test_runner/web_content_settings.cc',
- 'shell/renderer/test_runner/web_content_settings.h',
- 'shell/renderer/test_runner/web_frame_test_proxy.h',
- 'shell/renderer/test_runner/web_task.cc',
- 'shell/renderer/test_runner/web_task.h',
- 'shell/renderer/test_runner/web_test_delegate.h',
- 'shell/renderer/test_runner/web_test_interfaces.cc',
- 'shell/renderer/test_runner/web_test_interfaces.h',
- 'shell/renderer/test_runner/web_test_proxy.cc',
- 'shell/renderer/test_runner/web_test_proxy.h',
- 'shell/renderer/test_runner/web_test_runner.h',
],
'msvs_settings': {
'VCLinkerTool': {
@@ -423,6 +359,9 @@
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
},
+ 'dependencies': [
+ '../components/test_runner/test_runner.gyp:resources',
+ ],
'actions': [
{
'action_name': 'generate_content_shell_resources',
@@ -441,45 +380,6 @@
],
},
],
- 'conditions': [
- ['OS=="win"', {
- 'copies': [{
- 'destination': '<(PRODUCT_DIR)',
- 'files': ['shell/renderer/test_runner/resources/fonts/AHEM____.TTF'],
- }],
- }],
- ['OS=="mac"', {
- 'all_dependent_settings': {
- 'mac_bundle_resources': [
- 'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
- 'shell/renderer/test_runner/resources/fonts/ChromiumAATTest.ttf',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
- ],
- },
- }],
- ['use_x11 == 1', {
- 'copies': [{
- 'destination': '<(PRODUCT_DIR)',
- 'files': [
- 'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
- 'shell/renderer/test_runner/resources/fonts/fonts.conf',
- '../third_party/gardiner_mod/GardinerModBug.ttf',
- '../third_party/gardiner_mod/GardinerModCat.ttf',
- ]
- }],
- }],
- ['OS=="android"', {
- 'copies': [{
- 'destination': '<(PRODUCT_DIR)',
- 'files': [
- 'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
- 'shell/renderer/test_runner/resources/fonts/android_main_fonts.xml',
- 'shell/renderer/test_runner/resources/fonts/android_fallback_fonts.xml',
- ]
- }],
- }],
- ],
},
{
# We build a minimal set of resources so WebKit in content_shell has
@@ -808,28 +708,6 @@
}
],
'conditions': [
- ['OS=="mac" or OS=="win"', {
- 'targets': [
- {
- # GN version: //content/shell:layout_test_helper
- 'target_name': 'layout_test_helper',
- 'type': 'executable',
- 'sources': [
- 'shell/renderer/test_runner/helper/layout_test_helper_mac.mm',
- 'shell/renderer/test_runner/helper/layout_test_helper_win.cc',
- ],
- 'conditions': [
- ['OS=="mac"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
- ],
- },
- }],
- ],
- },
- ],
- }], # OS=="mac" or OS=="win"
['OS=="mac"', {
'targets': [
{
« no previous file with comments | « components/test_runner/web_test_runner.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698