summaryrefslogtreecommitdiffstats
path: root/chrome/common/zip_unittest.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 23:41:37 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 23:41:37 +0000
commit94bdde18a9fc933fb9a16d31ceef73307203c0bf (patch)
tree13bee409fda5e6696b9d7270c2f7ea40bbfaf189 /chrome/common/zip_unittest.cc
parentfa922b17ac56895da698ca72726e706948980960 (diff)
downloadchromium_src-94bdde18a9fc933fb9a16d31ceef73307203c0bf.zip
chromium_src-94bdde18a9fc933fb9a16d31ceef73307203c0bf.tar.gz
chromium_src-94bdde18a9fc933fb9a16d31ceef73307203c0bf.tar.bz2
Broaden valgrind supression for known issue in zlib. This seems ok because this code changes infrequently.
Re-enable zip unit tests on mac. Review URL: http://codereview.chromium.org/118087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/zip_unittest.cc')
-rw-r--r--chrome/common/zip_unittest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/common/zip_unittest.cc b/chrome/common/zip_unittest.cc
index 67dd487..17ab1fa 100644
--- a/chrome/common/zip_unittest.cc
+++ b/chrome/common/zip_unittest.cc
@@ -75,9 +75,7 @@ class ZipTest : public PlatformTest {
// hard-coded contents of a known zip file
std::set<FilePath> zip_contents_;
};
-// TODO(aa): re-enable this test for Mac (was disabled temporarily to clear
-// valgrind error on mac.
-#if !defined(OS_MACOSX)
+
TEST_F(ZipTest, Unzip) {
TestUnzipFile(FILE_PATH_LITERAL("test.zip"));
}
@@ -103,5 +101,5 @@ TEST_F(ZipTest, Zip) {
EXPECT_TRUE(file_util::Delete(zip_file, false));
}
-#endif // !defined(OS_MACOSX)
+
} // namespace