diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/chrome/test/chromedriver | |
parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/test/chromedriver')
-rw-r--r-- | chromium/chrome/test/chromedriver/BUILD.gn | 213 |
1 files changed, 188 insertions, 25 deletions
diff --git a/chromium/chrome/test/chromedriver/BUILD.gn b/chromium/chrome/test/chromedriver/BUILD.gn index 990b6c31a26..78750334dde 100644 --- a/chromium/chrome/test/chromedriver/BUILD.gn +++ b/chromium/chrome/test/chromedriver/BUILD.gn @@ -3,11 +3,8 @@ # found in the LICENSE file. import("//build/config/ui.gni") -import("//chrome/chrome_tests.gni") import("//testing/test.gni") -# GYP version: chrome/chrome_tests.gypi:automation_client_lib -# (embed_js_in_cpp action) action("embed_js_in_cpp") { script = "embed_js_in_cpp.py" @@ -33,8 +30,6 @@ action("embed_js_in_cpp") { args += rebase_path(js_files, root_build_dir) } -# GYP version: chrome/chrome_tests.gypi:automation_client_lib -# (embed_user_data_dir_in_cpp action) action("embed_user_data_dir_in_cpp") { script = "embed_user_data_dir_in_cpp.py" @@ -56,8 +51,6 @@ action("embed_user_data_dir_in_cpp") { args += rebase_path(files, root_build_dir) } -# GYP version: chrome/chrome_tests.gypi:automation_client_lib -# (embed_extension_in_cpp action) action("embed_extension_in_cpp") { script = "embed_extension_in_cpp.py" @@ -79,12 +72,100 @@ action("embed_extension_in_cpp") { args += rebase_path(files, root_build_dir) } -# GYP version: chrome/chrome_tests.gypi:automation_client_lib source_set("automation_client_lib") { - sources = - rebase_path(chrome_tests_gypi_values.chrome_automation_client_lib_sources, - ".", - "//chrome") + sources = [ + "chrome/adb.h", + "chrome/adb_impl.cc", + "chrome/adb_impl.h", + "chrome/automation_extension.cc", + "chrome/automation_extension.h", + "chrome/chrome.h", + "chrome/chrome_android_impl.cc", + "chrome/chrome_android_impl.h", + "chrome/chrome_desktop_impl.cc", + "chrome/chrome_desktop_impl.h", + "chrome/chrome_finder.cc", + "chrome/chrome_finder.h", + "chrome/chrome_finder_mac.mm", + "chrome/chrome_impl.cc", + "chrome/chrome_impl.h", + "chrome/chrome_remote_impl.cc", + "chrome/chrome_remote_impl.h", + "chrome/console_logger.cc", + "chrome/console_logger.h", + "chrome/debugger_tracker.cc", + "chrome/debugger_tracker.h", + "chrome/device_manager.cc", + "chrome/device_manager.h", + "chrome/device_metrics.cc", + "chrome/device_metrics.h", + "chrome/devtools_client.h", + "chrome/devtools_client_impl.cc", + "chrome/devtools_client_impl.h", + "chrome/devtools_event_listener.cc", + "chrome/devtools_event_listener.h", + "chrome/devtools_http_client.cc", + "chrome/devtools_http_client.h", + "chrome/dom_tracker.cc", + "chrome/dom_tracker.h", + "chrome/frame_tracker.cc", + "chrome/frame_tracker.h", + "chrome/geolocation_override_manager.cc", + "chrome/geolocation_override_manager.h", + "chrome/geoposition.h", + "chrome/heap_snapshot_taker.cc", + "chrome/heap_snapshot_taker.h", + "chrome/javascript_dialog_manager.cc", + "chrome/javascript_dialog_manager.h", + "chrome/log.cc", + "chrome/log.h", + "chrome/mobile_device.cc", + "chrome/mobile_device.h", + "chrome/mobile_device_list.cc", + "chrome/mobile_device_list.h", + "chrome/mobile_emulation_override_manager.cc", + "chrome/mobile_emulation_override_manager.h", + "chrome/navigation_tracker.cc", + "chrome/navigation_tracker.h", + "chrome/network_conditions.cc", + "chrome/network_conditions.h", + "chrome/network_conditions_override_manager.cc", + "chrome/network_conditions_override_manager.h", + "chrome/network_list.cc", + "chrome/network_list.h", + "chrome/non_blocking_navigation_tracker.cc", + "chrome/non_blocking_navigation_tracker.h", + "chrome/page_load_strategy.cc", + "chrome/page_load_strategy.h", + "chrome/status.cc", + "chrome/status.h", + "chrome/ui_events.cc", + "chrome/ui_events.h", + "chrome/util.cc", + "chrome/util.h", + "chrome/version.cc", + "chrome/version.h", + "chrome/web_view.h", + "chrome/web_view_impl.cc", + "chrome/web_view_impl.h", + "net/adb_client_socket.cc", + "net/adb_client_socket.h", + "net/net_util.cc", + "net/net_util.h", + "net/port_server.cc", + "net/port_server.h", + "net/sync_websocket.h", + "net/sync_websocket_factory.cc", + "net/sync_websocket_factory.h", + "net/sync_websocket_impl.cc", + "net/sync_websocket_impl.h", + "net/timeout.cc", + "net/timeout.h", + "net/url_request_context_getter.cc", + "net/url_request_context_getter.h", + "net/websocket.cc", + "net/websocket.h", + ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] @@ -111,8 +192,6 @@ source_set("automation_client_lib") { ] } -# GYP version: chrome/chrome_tests.gypi:chromedriver_lib -# (embed_version_in_cpp action) action("embed_version_in_cpp") { script = "embed_version_in_cpp.py" inputs = [ @@ -132,11 +211,53 @@ action("embed_version_in_cpp") { ] } -# GYP version: chrome/chrome_tests.gypi:chromedriver_lib source_set("lib") { - sources = rebase_path(chrome_tests_gypi_values.chrome_driver_lib_sources, - ".", - "//chrome") + sources = [ + "//third_party/webdriver/atoms.cc", + "//third_party/webdriver/atoms.h", + "alert_commands.cc", + "alert_commands.h", + "basic_types.cc", + "basic_types.h", + "capabilities.cc", + "capabilities.h", + "chrome/browser_info.cc", + "chrome/browser_info.h", + "chrome_launcher.cc", + "chrome_launcher.h", + "command.h", + "command_listener.h", + "command_listener_proxy.cc", + "command_listener_proxy.h", + "commands.cc", + "commands.h", + "element_commands.cc", + "element_commands.h", + "element_util.cc", + "element_util.h", + "key_converter.cc", + "key_converter.h", + "keycode_text_conversion.h", + "keycode_text_conversion_mac.mm", + "keycode_text_conversion_ozone.cc", + "keycode_text_conversion_win.cc", + "keycode_text_conversion_x.cc", + "logging.cc", + "logging.h", + "performance_logger.cc", + "performance_logger.h", + "server/http_handler.cc", + "server/http_handler.h", + "session.cc", + "session.h", + "session_commands.cc", + "session_commands.h", + "session_thread_map.h", + "util.cc", + "util.h", + "window_commands.cc", + "window_commands.h", + ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] @@ -157,6 +278,7 @@ source_set("lib") { ":embed_version_in_cpp", "//base", "//base/third_party/dynamic_annotations", + "//chrome/common:constants", "//chrome/common:version_header", "//crypto", "//net", @@ -196,10 +318,43 @@ executable("chromedriver") { } test("chromedriver_unittests") { - sources = - rebase_path(chrome_tests_gypi_values.chrome_driver_unittests_sources, - ".", - "//chrome") + sources = [ + "capabilities_unittest.cc", + "chrome/browser_info_unittest.cc", + "chrome/chrome_finder_unittest.cc", + "chrome/console_logger_unittest.cc", + "chrome/device_manager_unittest.cc", + "chrome/devtools_client_impl_unittest.cc", + "chrome/devtools_http_client_unittest.cc", + "chrome/dom_tracker_unittest.cc", + "chrome/frame_tracker_unittest.cc", + "chrome/geolocation_override_manager_unittest.cc", + "chrome/heap_snapshot_taker_unittest.cc", + "chrome/javascript_dialog_manager_unittest.cc", + "chrome/mobile_emulation_override_manager_unittest.cc", + "chrome/navigation_tracker_unittest.cc", + "chrome/network_conditions_override_manager_unittest.cc", + "chrome/recorder_devtools_client.cc", + "chrome/recorder_devtools_client.h", + "chrome/status_unittest.cc", + "chrome/stub_chrome.cc", + "chrome/stub_chrome.h", + "chrome/stub_devtools_client.cc", + "chrome/stub_devtools_client.h", + "chrome/stub_web_view.cc", + "chrome/stub_web_view.h", + "chrome/web_view_impl_unittest.cc", + "chrome_launcher_unittest.cc", + "command_listener_proxy_unittest.cc", + "commands_unittest.cc", + "logging_unittest.cc", + "net/timeout_unittest.cc", + "performance_logger_unittest.cc", + "server/http_handler_unittest.cc", + "session_commands_unittest.cc", + "session_unittest.cc", + "util_unittest.cc", + ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] @@ -224,9 +379,16 @@ test("chromedriver_unittests") { # ChromeDriver tests that aren't run on the main buildbot. Available as an # optional test type on trybots. test("chromedriver_tests") { - sources = rebase_path(chrome_tests_gypi_values.chrome_driver_tests_sources, - ".", - "//chrome") + sources = [ + "key_converter_unittest.cc", + "keycode_text_conversion_unittest.cc", + "net/net_util_unittest.cc", + "net/port_server_unittest.cc", + "net/sync_websocket_impl_unittest.cc", + "net/test_http_server.cc", + "net/test_http_server.h", + "net/websocket_unittest.cc", + ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] @@ -239,6 +401,7 @@ test("chromedriver_tests") { "//net:http_server", "//net:test_support", "//testing/gtest", + "//ui/events:test_support", "//url", ] } |