summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-24 20:40:21 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-24 20:40:21 +0000
commite0c9e24599c1bffa614af97b60ba77a8e9826d99 (patch)
tree374a0061c7fbaf6238c18ace46783e07009a3933 /net/net.gyp
parentb5db5eefdea45fb50601433e13fc6e2c7ac6f4a0 (diff)
downloadchromium_src-e0c9e24599c1bffa614af97b60ba77a8e9826d99.zip
chromium_src-e0c9e24599c1bffa614af97b60ba77a8e9826d99.tar.gz
chromium_src-e0c9e24599c1bffa614af97b60ba77a8e9826d99.tar.bz2
[sync] Add --port and --xmpp-port parameters to run_testserver.cc
run_testserver is a useful test utility that launches a python testserver after setting the required python path. When it is used to start a sync testserver, the only parameter it supports is --sync, indicating that we want a sync server. It doesn't support the --port and --xmpp-port flags, that are used to specify the ports on which we want the sync server and sync xmpp server to run. This patch adds the parameters to run_testserver.cc and plumbs them down to the TestServer objects created by run_testserver.cc. It also separates out sync specific testserver code into a new class called LocalSyncTestServer. Separating the sync server in python code is out of the scope of this CL because it requires significant refactoring, since it is in use on multiple platforms, and will be dealt with separately. BUG= 117559 TEST=Build and run run_testserver with the paramters --sync, --port and --xmpp-port Review URL: https://chromiumcodereview.appspot.com/10388206 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 7bf527f..9178ba4 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1533,6 +1533,8 @@
'socket/socket_test_util.h',
'test/base_test_server.cc',
'test/base_test_server.h',
+ 'test/local_sync_test_server.cc',
+ 'test/local_sync_test_server.h',
'test/local_test_server_posix.cc',
'test/local_test_server_win.cc',
'test/local_test_server.cc',