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

Unified Diff: chrome/chrome_tests.gypi

Issue 11316115: [chromedriver] Write websocket client and sync websocket client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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/net/sync_websocket.h » ('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 cca474f21f07c20570ccd0448bfda8378be1eb93..21fd170cf60da4f1d8db4515b47b1cd8864b886a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -617,7 +617,9 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations'
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../net/net.gyp:net',
],
'include_dirs': [
'..',
@@ -640,6 +642,12 @@
'test/chromedriver/command_executor_impl.h',
'test/chromedriver/commands.cc',
'test/chromedriver/commands.h',
+ 'test/chromedriver/net/sync_websocket.cc',
+ 'test/chromedriver/net/sync_websocket.h',
+ 'test/chromedriver/net/url_request_context_getter.cc',
+ '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_command.cc',
@@ -675,6 +683,28 @@
'test/chromedriver/synchronized_map_unittest.cc',
],
},
+ # ChromeDriver2 tests that aren't run on the main buildbots.
+ {
+ 'target_name': 'chromedriver2_tests',
+ 'type': 'executable',
+ 'dependencies': [
+ 'chromedriver2_lib',
+ '../base/base.gyp:base',
+ '../base/base.gyp:run_all_unittests',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../net/net.gyp:http_server',
+ '../net/net.gyp:net',
+ '../net/net.gyp:net_test_support',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'include_dirs': [
+ '..,'
+ ],
+ 'sources': [
+ 'test/chromedriver/net/sync_websocket_unittest.cc',
+ 'test/chromedriver/net/websocket_unittest.cc',
+ ],
+ },
# This is the new ChromeDriver based on DevTools.
{
'target_name': 'chromedriver2',
« no previous file with comments | « no previous file | chrome/test/chromedriver/net/sync_websocket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698