diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-01 03:32:24 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-01 03:32:24 +0000 |
| commit | fa5c17f08ca05026e4a832aebacc44d09b8da9f5 (patch) | |
| tree | 49f8fa1ef57f1214a7c2bea788107c47e68790cb /chrome/common | |
| parent | 4777bc566e7931c891c4fa16261f04ed940ec9d5 (diff) | |
| download | chromium_src-fa5c17f08ca05026e4a832aebacc44d09b8da9f5.zip chromium_src-fa5c17f08ca05026e4a832aebacc44d09b8da9f5.tar.gz chromium_src-fa5c17f08ca05026e4a832aebacc44d09b8da9f5.tar.bz2 | |
Fix bustage.
Review URL: http://codereview.chromium.org/118067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/zip.cc | 2 | ||||
| -rw-r--r-- | chrome/common/zip_unittest.cc | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc index 8ffd12c..9b34dcb 100644 --- a/chrome/common/zip.cc +++ b/chrome/common/zip.cc @@ -265,7 +265,7 @@ bool Zip(const FilePath& src_dir, const FilePath& dest_file) { #if defined(OS_POSIX) std::string dest_file_str = dest_file.value(); std::string src_dir_str = src_dir.value(); - zipFile zip_file = zipOpen(src_dir_str.c_str(), APPEND_STATUS_CREATE); + zipFile zip_file = zipOpen(dest_file_str.c_str(), APPEND_STATUS_CREATE); #elif defined(OS_WIN) std::string dest_file_str = WideToUTF8(dest_file.value()); zipFile zip_file = zipOpen2(dest_file_str.c_str(), APPEND_STATUS_CREATE, diff --git a/chrome/common/zip_unittest.cc b/chrome/common/zip_unittest.cc index cf46318..a788398 100644 --- a/chrome/common/zip_unittest.cc +++ b/chrome/common/zip_unittest.cc @@ -60,9 +60,12 @@ class ZipTest : public PlatformTest { FilePath next_path = files.Next(); size_t count = 0; while (!next_path.value().empty()) { - EXPECT_EQ(zip_contents_.count(next_path), 1U) << - "Couldn't find " << next_path.value(); - count++; + if (next_path.value().find(FILE_PATH_LITERAL("/.svn/")) == + FilePath::StringType::npos) { + EXPECT_EQ(zip_contents_.count(next_path), 1U) << + "Couldn't find " << next_path.value(); + count++; + } next_path = files.Next(); } EXPECT_EQ(count, zip_contents_.size()); |