diff options
Diffstat (limited to 'net/socket/ssl_test_util.cc')
| -rw-r--r-- | net/socket/ssl_test_util.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc index b52dba5..48126be 100644 --- a/net/socket/ssl_test_util.cc +++ b/net/socket/ssl_test_util.cc @@ -89,7 +89,7 @@ void AppendToPythonPath(const FilePath& dir) { SetEnvironmentVariableW(kPythonPath, dir.value().c_str()); } else if (!wcsstr(oldpath, dir.value().c_str())) { std::wstring newpath(oldpath); - newpath.append(L":"); + newpath.append(L";"); newpath.append(dir.value()); SetEnvironmentVariableW(kPythonPath, newpath.c_str()); } @@ -117,6 +117,13 @@ void TestServerLauncher::SetPythonPath() { AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("tlslite"))); AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("pyftpdlib"))); + + // Locate the Python code generated by the protocol buffers compiler. + FilePath generated_code_dir; + CHECK(PathService::Get(base::DIR_EXE, &generated_code_dir)); + generated_code_dir = generated_code_dir.Append(FILE_PATH_LITERAL("pyproto")); + AppendToPythonPath(generated_code_dir); + AppendToPythonPath(generated_code_dir.Append(FILE_PATH_LITERAL("sync_pb"))); } bool TestServerLauncher::Start(Protocol protocol, |