diff options
| -rw-r--r-- | chrome/common/zip_unittest.cc | 6 | ||||
| -rw-r--r-- | tools/valgrind/suppressions.txt | 3 |
2 files changed, 3 insertions, 6 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 diff --git a/tools/valgrind/suppressions.txt b/tools/valgrind/suppressions.txt index 431c699..ca8c65b 100644 --- a/tools/valgrind/suppressions.txt +++ b/tools/valgrind/suppressions.txt @@ -14,8 +14,7 @@ { Uninitialized value in deflate Memcheck:Cond - fun:longest_match - fun:deflate_slow + ... fun:MOZ_Z_deflate } { |