diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-26 02:28:18 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-26 02:28:18 +0000 |
| commit | 23ced42b6e81e851880c437cf36b79e4d183a040 (patch) | |
| tree | bfbfda29e606395b8b632a0ddd71b8607a0c76ee /net/test | |
| parent | 7bcb7fddf0e94511dbb0107e27e735328b7ed90a (diff) | |
| download | chromium_src-23ced42b6e81e851880c437cf36b79e4d183a040.zip chromium_src-23ced42b6e81e851880c437cf36b79e4d183a040.tar.gz chromium_src-23ced42b6e81e851880c437cf36b79e4d183a040.tar.bz2 | |
Added server_data json dictionary to testserver.py
This is split off from 5196001.
BUG=53934
TEST=manually
TBR=cbentzel
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/test_server.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 0e8c461..1ae2c5b 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -278,6 +278,11 @@ bool TestServer::SetPythonPath() { } third_party_dir = third_party_dir.Append(FILE_PATH_LITERAL("third_party")); + // For simplejson. (simplejson, unlike all the other python modules + // we include, doesn't have an extra 'simplejson' directory, so we + // need to include its parent directory, i.e. third_party_dir). + AppendToPythonPath(third_party_dir); + AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("tlslite"))); AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("pyftpdlib"))); |