diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 00:38:40 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 00:38:40 +0000 |
| commit | b3e21af83f350be4319aa2bc00d86004b84e46b2 (patch) | |
| tree | 9774bb77433439a81fe629b73280e0e6cbfedcca /net/test | |
| parent | 521b6efb91ea0c7cf11f4fc49c92fc32d8850595 (diff) | |
| download | chromium_src-b3e21af83f350be4319aa2bc00d86004b84e46b2.zip chromium_src-b3e21af83f350be4319aa2bc00d86004b84e46b2.tar.gz chromium_src-b3e21af83f350be4319aa2bc00d86004b84e46b2.tar.bz2 | |
Fix python sync server on Chrome OS
Bug 58522 was logged because bringing up the python sync server on Mac
failed due to a mismatch in the path to the protobuf files. We recently
noticed the same issue on our Chrome OS autotest runs as well.
This patch modifies the workaround checked in with
http://src.chromium.org/viewvc/chrome?view=rev&revision=62335 so that it
applies to Chrome OS as well.
BUG=60637, 58522
TEST=sync_integration_tests on Chrome OS
Review URL: http://codereview.chromium.org/4133001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/python_utils.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc index 3a1068f..13438f7 100644 --- a/net/test/python_utils.cc +++ b/net/test/python_utils.cc @@ -46,10 +46,10 @@ bool GetPyProtoPath(FilePath* dir) { 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. +#if defined(OS_MACOSX) || defined(OS_CHROMEOS) + // On Mac and Chrome OS, 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) { |