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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 12848005: [chromedriver] Separate stuff of chrome from chromedriver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | « no previous file | chrome/test/chromedriver/adb_commands.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 844976662f25399adc6c819971768eec19751694..6beaefc8da656032b59873bee802cea2f9993fb9 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -720,8 +720,9 @@
],
},
{
- 'target_name': 'chromedriver2_lib',
+ 'target_name': 'chrome_devtools_lib',
'type': 'static_library',
+ 'hard_dependency': 1,
'dependencies': [
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -733,60 +734,57 @@
],
'include_dirs': [
'..',
- '<(INTERMEDIATE_DIR)',
+ '<(SHARED_INTERMEDIATE_DIR)',
],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+ },
'sources': [
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/js.cc',
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/js.h',
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/user_data_dir.cc',
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/user_data_dir.h',
- '../third_party/webdriver/atoms.cc',
- '../third_party/webdriver/atoms.h',
- 'test/chromedriver/basic_types.cc',
- 'test/chromedriver/basic_types.h',
- 'test/chromedriver/chrome.h',
- 'test/chromedriver/chrome_finder.cc',
- 'test/chromedriver/chrome_finder.h',
- 'test/chromedriver/chrome_finder_mac.mm',
- 'test/chromedriver/chrome_impl.cc',
- 'test/chromedriver/chrome_impl.h',
- 'test/chromedriver/chrome_android_impl.cc',
- 'test/chromedriver/chrome_android_impl.h',
- 'test/chromedriver/chrome_desktop_impl.cc',
- 'test/chromedriver/chrome_desktop_impl.h',
- 'test/chromedriver/chromedriver.cc',
- 'test/chromedriver/chromedriver.h',
- 'test/chromedriver/command.h',
- 'test/chromedriver/command_executor.h',
- 'test/chromedriver/command_executor_impl.cc',
- 'test/chromedriver/command_executor_impl.h',
- 'test/chromedriver/command_names.cc',
- 'test/chromedriver/command_names.h',
- 'test/chromedriver/commands.cc',
- 'test/chromedriver/commands.h',
- 'test/chromedriver/devtools_client.cc',
- 'test/chromedriver/devtools_client.h',
- 'test/chromedriver/devtools_client_impl.cc',
- 'test/chromedriver/devtools_client_impl.h',
- 'test/chromedriver/devtools_event_listener.h',
- 'test/chromedriver/dom_tracker.cc',
- 'test/chromedriver/dom_tracker.h',
- 'test/chromedriver/element_commands.cc',
- 'test/chromedriver/element_commands.h',
- 'test/chromedriver/element_util.cc',
- 'test/chromedriver/element_util.h',
- 'test/chromedriver/frame_tracker.cc',
- 'test/chromedriver/frame_tracker.h',
- 'test/chromedriver/javascript_dialog_manager.cc',
- 'test/chromedriver/javascript_dialog_manager.h',
- 'test/chromedriver/key_converter.cc',
- 'test/chromedriver/key_converter.h',
- 'test/chromedriver/keycode_text_conversion.h',
- 'test/chromedriver/keycode_text_conversion_mac.mm',
- 'test/chromedriver/keycode_text_conversion_win.cc',
- 'test/chromedriver/keycode_text_conversion_x.cc',
- 'test/chromedriver/navigation_tracker.cc',
- 'test/chromedriver/navigation_tracker.h',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.h',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h',
+ 'test/chromedriver/chrome/chrome.h',
+ 'test/chromedriver/chrome/chrome_finder.cc',
+ 'test/chromedriver/chrome/chrome_finder.h',
+ 'test/chromedriver/chrome/chrome_finder_mac.mm',
+ 'test/chromedriver/chrome/chrome_impl.cc',
+ 'test/chromedriver/chrome/chrome_impl.h',
+ 'test/chromedriver/chrome/chrome_android_impl.cc',
+ 'test/chromedriver/chrome/chrome_android_impl.h',
+ 'test/chromedriver/chrome/chrome_desktop_impl.cc',
+ 'test/chromedriver/chrome/chrome_desktop_impl.h',
+ 'test/chromedriver/chrome/devtools_client.cc',
+ 'test/chromedriver/chrome/devtools_client.h',
+ 'test/chromedriver/chrome/devtools_client_impl.cc',
+ 'test/chromedriver/chrome/devtools_client_impl.h',
+ 'test/chromedriver/chrome/devtools_event_listener.h',
+ 'test/chromedriver/chrome/dom_tracker.cc',
+ 'test/chromedriver/chrome/dom_tracker.h',
+ 'test/chromedriver/chrome/frame_tracker.cc',
+ 'test/chromedriver/chrome/frame_tracker.h',
+ 'test/chromedriver/chrome/javascript_dialog_manager.cc',
+ 'test/chromedriver/chrome/javascript_dialog_manager.h',
+ 'test/chromedriver/chrome/navigation_tracker.cc',
+ 'test/chromedriver/chrome/navigation_tracker.h',
+ 'test/chromedriver/chrome/status.cc',
+ 'test/chromedriver/chrome/status.h',
+ 'test/chromedriver/chrome/ui_events.cc',
+ 'test/chromedriver/chrome/ui_events.h',
+ 'test/chromedriver/chrome/version.cc',
+ 'test/chromedriver/chrome/version.h',
+ 'test/chromedriver/chrome/web_view_delegate.h',
+ 'test/chromedriver/chrome/web_view.h',
+ 'test/chromedriver/chrome/web_view_impl.cc',
+ 'test/chromedriver/chrome/web_view_impl.h',
+ 'test/chromedriver/chrome/zip.cc',
+ 'test/chromedriver/chrome/zip.h',
+ 'test/chromedriver/chrome/zip_internal.cc',
+ 'test/chromedriver/chrome/zip_internal.h',
+ 'test/chromedriver/chrome/zip_reader.cc',
+ 'test/chromedriver/chrome/zip_reader.h',
'test/chromedriver/net/net_util.cc',
'test/chromedriver/net/net_util.h',
'test/chromedriver/net/sync_websocket.h',
@@ -798,32 +796,6 @@
'test/chromedriver/net/url_request_context_getter.h',
'test/chromedriver/net/websocket.cc',
'test/chromedriver/net/websocket.h',
- 'test/chromedriver/session.cc',
- 'test/chromedriver/session.h',
- 'test/chromedriver/session_commands.cc',
- 'test/chromedriver/session_commands.h',
- 'test/chromedriver/session_map.h',
- 'test/chromedriver/status.cc',
- 'test/chromedriver/status.h',
- 'test/chromedriver/synchronized_map.h',
- 'test/chromedriver/ui_events.cc',
- 'test/chromedriver/ui_events.h',
- 'test/chromedriver/util.cc',
- 'test/chromedriver/util.h',
- 'test/chromedriver/version.cc',
- 'test/chromedriver/version.h',
- 'test/chromedriver/web_view_delegate.h',
- 'test/chromedriver/web_view.h',
- 'test/chromedriver/web_view_impl.cc',
- 'test/chromedriver/web_view_impl.h',
- 'test/chromedriver/window_commands.cc',
- 'test/chromedriver/window_commands.h',
- 'test/chromedriver/zip.cc',
- 'test/chromedriver/zip.h',
- 'test/chromedriver/zip_internal.cc',
- 'test/chromedriver/zip_internal.h',
- 'test/chromedriver/zip_reader.cc',
- 'test/chromedriver/zip_reader.h',
],
'actions': [
{
@@ -839,13 +811,13 @@
'test/chromedriver/js/is_option_element_toggleable.js',
],
'outputs': [
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/js.cc',
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/js.h',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.h',
],
'action': [ 'python',
'test/chromedriver/embed_js_in_cpp.py',
'--directory',
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome',
'test/chromedriver/js/add_cookie.js',
'test/chromedriver/js/call_function.js',
'test/chromedriver/js/execute_async_script.js',
@@ -860,19 +832,19 @@
'inputs': [
'test/chromedriver/cpp_source.py',
'test/chromedriver/embed_user_data_dir_in_cpp.py',
- 'test/chromedriver/preferences.txt',
- 'test/chromedriver/local_state.txt',
+ 'test/chromedriver/chrome/preferences.txt',
+ 'test/chromedriver/chrome/local_state.txt',
],
'outputs': [
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/user_data_dir.cc',
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver/user_data_dir.h',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h',
],
'action': [ 'python',
'test/chromedriver/embed_user_data_dir_in_cpp.py',
'--directory',
- '<(INTERMEDIATE_DIR)/chrome/test/chromedriver',
- 'test/chromedriver/preferences.txt',
- 'test/chromedriver/local_state.txt',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome',
+ 'test/chromedriver/chrome/preferences.txt',
+ 'test/chromedriver/chrome/local_state.txt',
],
'message': 'Generating sources for embedding user data dir in chromedriver',
},
@@ -880,6 +852,58 @@
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
},
+ {
+ 'target_name': 'chromedriver2_lib',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'chrome_devtools_lib',
+ '../base/base.gyp:base',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../net/net.gyp:net',
+ '../ui/ui.gyp:ui',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ '../third_party/webdriver/atoms.cc',
+ '../third_party/webdriver/atoms.h',
+ 'test/chromedriver/basic_types.cc',
+ 'test/chromedriver/basic_types.h',
+ 'test/chromedriver/chromedriver.cc',
+ 'test/chromedriver/chromedriver.h',
+ 'test/chromedriver/command.h',
+ 'test/chromedriver/command_executor.h',
+ 'test/chromedriver/command_executor_impl.cc',
+ 'test/chromedriver/command_executor_impl.h',
+ 'test/chromedriver/command_names.cc',
+ 'test/chromedriver/command_names.h',
+ 'test/chromedriver/commands.cc',
+ 'test/chromedriver/commands.h',
+ 'test/chromedriver/element_commands.cc',
+ 'test/chromedriver/element_commands.h',
+ 'test/chromedriver/element_util.cc',
+ 'test/chromedriver/element_util.h',
+ 'test/chromedriver/key_converter.cc',
+ 'test/chromedriver/key_converter.h',
+ 'test/chromedriver/keycode_text_conversion.h',
+ 'test/chromedriver/keycode_text_conversion_mac.mm',
+ 'test/chromedriver/keycode_text_conversion_win.cc',
+ 'test/chromedriver/keycode_text_conversion_x.cc',
+ 'test/chromedriver/session.cc',
+ 'test/chromedriver/session.h',
+ 'test/chromedriver/session_commands.cc',
+ 'test/chromedriver/session_commands.h',
+ 'test/chromedriver/session_map.h',
+ 'test/chromedriver/synchronized_map.h',
+ 'test/chromedriver/util.cc',
+ 'test/chromedriver/util.h',
+ 'test/chromedriver/window_commands.cc',
+ 'test/chromedriver/window_commands.h',
+ ],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [ 4267, ],
+ },
# This is the new ChromeDriver based on DevTools.
{
'target_name': 'chromedriver2',
@@ -947,32 +971,32 @@
'../ui/ui.gyp:ui',
],
'sources': [
- 'test/chromedriver/chrome_desktop_impl_unittest.cc',
- 'test/chromedriver/chrome_finder_unittest.cc',
- 'test/chromedriver/chrome_impl_unittest.cc',
+ 'test/chromedriver/chrome/chrome_desktop_impl_unittest.cc',
+ 'test/chromedriver/chrome/chrome_finder_unittest.cc',
+ 'test/chromedriver/chrome/chrome_impl_unittest.cc',
+ 'test/chromedriver/chrome/devtools_client_impl_unittest.cc',
+ 'test/chromedriver/chrome/dom_tracker_unittest.cc',
+ 'test/chromedriver/chrome/frame_tracker_unittest.cc',
+ 'test/chromedriver/chrome/javascript_dialog_manager_unittest.cc',
+ 'test/chromedriver/chrome/navigation_tracker_unittest.cc',
+ 'test/chromedriver/chrome/status_unittest.cc',
+ 'test/chromedriver/chrome/stub_chrome.cc',
+ 'test/chromedriver/chrome/stub_chrome.h',
+ 'test/chromedriver/chrome/stub_devtools_client.cc',
+ 'test/chromedriver/chrome/stub_devtools_client.h',
+ 'test/chromedriver/chrome/stub_web_view.cc',
+ 'test/chromedriver/chrome/stub_web_view.h',
'test/chromedriver/chromedriver_unittest.cc',
'test/chromedriver/command_executor_impl_unittest.cc',
'test/chromedriver/commands_unittest.cc',
- 'test/chromedriver/devtools_client_impl_unittest.cc',
- 'test/chromedriver/dom_tracker_unittest.cc',
'test/chromedriver/fake_session_accessor.cc',
'test/chromedriver/fake_session_accessor.h',
- 'test/chromedriver/frame_tracker_unittest.cc',
- 'test/chromedriver/javascript_dialog_manager_unittest.cc',
- 'test/chromedriver/navigation_tracker_unittest.cc',
'test/chromedriver/server/http_handler_unittest.cc',
'test/chromedriver/server/http_response_unittest.cc',
'test/chromedriver/session_commands_unittest.cc',
'test/chromedriver/session_unittest.cc',
- 'test/chromedriver/status_unittest.cc',
- 'test/chromedriver/stub_chrome.cc',
- 'test/chromedriver/stub_chrome.h',
- 'test/chromedriver/stub_devtools_client.cc',
- 'test/chromedriver/stub_devtools_client.h',
- 'test/chromedriver/stub_web_view.cc',
- 'test/chromedriver/stub_web_view.h',
'test/chromedriver/synchronized_map_unittest.cc',
- 'test/chromedriver/web_view_impl_unittest.cc',
+ 'test/chromedriver/chrome/web_view_impl_unittest.cc',
kkania 2013/03/14 23:13:05 looks like this is out of order
chrisgao (Use stgao instead) 2013/03/15 00:26:31 Done.
],
},
# ChromeDriver2 tests that aren't run on the main buildbot. Available
« no previous file with comments | « no previous file | chrome/test/chromedriver/adb_commands.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698