From 813e9cd124841e826bd24aa2c00fe812815d7796 Mon Sep 17 00:00:00 2001
From: "lzheng@chromium.org"
<lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 9 Nov 2010 21:49:40 +0000
Subject: Make sure the generated python proto buff path is right. BUG=62415
TEST=mac trybot green with safe_browsing_tests Review URL:
http://codereview.chromium.org/4677002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65574 0039d316-1c4b-4281-b951-d872f2087c98
---
net/test/test_server.cc | 29 +++++------------------------
1 file changed, 5 insertions(+), 24 deletions(-)
(limited to 'net/test/test_server.cc')
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index 4b426eb..f5592a2 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -284,33 +284,14 @@ bool TestServer::SetPythonPath() {
AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("pyftpdlib")));
// Locate the Python code generated by the protocol buffers compiler.
- FilePath generated_code_dir;
- if (!PathService::Get(base::DIR_EXE, &generated_code_dir)) {
- LOG(ERROR) << "Failed to get DIR_EXE";
+ FilePath pyproto_code_dir;
+ if (!GetPyProtoPath(&pyproto_code_dir)) {
+ LOG(ERROR) << "Failed to get python dir for generated code.";
return false;
}
- static const FilePath kPyProto(FILE_PATH_LITERAL("pyproto"));
-
-#if defined(OS_MACOSX)
- // On Mac, DIR_EXE might be pointing deep into the Release/ (or Debug/)
- // directory and we can't depend on how far down it goes. So we walk upwards
- // from DIR_EXE until we find a likely looking spot.
- while (!file_util::DirectoryExists(generated_code_dir.Append(kPyProto))) {
- FilePath parent = generated_code_dir.DirName();
- if (parent == generated_code_dir) {
- // We hit the root directory. Maybe we didn't build any targets which
- // produced Python protocol buffers.
- PathService::Get(base::DIR_EXE, &generated_code_dir);
- break;
- }
- generated_code_dir = parent;
- }
-#endif
-
- AppendToPythonPath(generated_code_dir.Append(kPyProto));
- AppendToPythonPath(generated_code_dir.Append(kPyProto).
- Append(FILE_PATH_LITERAL("sync_pb")));
+ AppendToPythonPath(pyproto_code_dir);
+ AppendToPythonPath(pyproto_code_dir.Append(FILE_PATH_LITERAL("sync_pb")));
return true;
}
--
cgit v1.1