summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 12:59:50 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 12:59:50 +0000
commitc759a33935b7d73b76eec9e66997fe5501b1174f (patch)
treef637d3c557f5157f3c11111f12afb929296e3038
parentf5e70d360e017053805277f695577b8e99981cba (diff)
downloadchromium_src-c759a33935b7d73b76eec9e66997fe5501b1174f.zip
chromium_src-c759a33935b7d73b76eec9e66997fe5501b1174f.tar.gz
chromium_src-c759a33935b7d73b76eec9e66997fe5501b1174f.tar.bz2
Update Dr. Memory suppressions, gtest_filters and also skip oob-write sanity tests on Windows.
TBR=glider Review URL: http://codereview.chromium.org/3616001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61171 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/data/valgrind/base_unittests.gtest-drmemory_win32.txt1
-rw-r--r--base/tools_sanity_unittest.cc8
-rw-r--r--net/data/valgrind/net_unittests.gtest-drmemory_win32.txt8
-rw-r--r--tools/valgrind/drmemory/suppressions.txt18
4 files changed, 31 insertions, 4 deletions
diff --git a/base/data/valgrind/base_unittests.gtest-drmemory_win32.txt b/base/data/valgrind/base_unittests.gtest-drmemory_win32.txt
index 1a9d52c..b73fa61 100644
--- a/base/data/valgrind/base_unittests.gtest-drmemory_win32.txt
+++ b/base/data/valgrind/base_unittests.gtest-drmemory_win32.txt
@@ -8,3 +8,4 @@ GmockTest.*
EtwTrace*
StatsTableTest.*
ProcessUtilTest.EnableLFH
+ScopedNativeLibrary.Basic
diff --git a/base/tools_sanity_unittest.cc b/base/tools_sanity_unittest.cc
index ab2d197..47a19b3 100644
--- a/base/tools_sanity_unittest.cc
+++ b/base/tools_sanity_unittest.cc
@@ -65,8 +65,16 @@ void MakeSomeErrors(char *ptr, size_t size) {
ReadUninitializedValue(ptr);
ReadValueOutOfArrayBoundsLeft(ptr);
ReadValueOutOfArrayBoundsRight(ptr, size);
+
+ // We execute this function only under memory checking tools -
+ // Valgrind on Linux and Mac, Dr. Memory on Windows.
+ // Currently writing values out-of-bounds makes Dr. Memory a bit crazy when
+ // this code is linked with /MTd, so skip these writes on Windows.
+ // See http://code.google.com/p/drmemory/issues/detail?id=51
+#if !defined(OS_WIN)
WriteValueOutOfArrayBoundsLeft(ptr);
WriteValueOutOfArrayBoundsRight(ptr, size);
+#endif
}
TEST(ToolsSanityTest, AccessesToNewMemory) {
diff --git a/net/data/valgrind/net_unittests.gtest-drmemory_win32.txt b/net/data/valgrind/net_unittests.gtest-drmemory_win32.txt
index 6538733..10b8617 100644
--- a/net/data/valgrind/net_unittests.gtest-drmemory_win32.txt
+++ b/net/data/valgrind/net_unittests.gtest-drmemory_win32.txt
@@ -1,12 +1,14 @@
+# See http://crbug.com/51145
+HttpNetworkTransactionTest.*
+HttpNetworkLayerTest.GET
+
# TODO(timurrrr): investigate these
ClientSocketPoolBaseTest.*
SSLClientSocketTest.*
-ProxyResolver*
-DiskCache*Test.*
+ProxyResolverJS*
X509CertificateTest.*
UrlToFilenameEncoderTest.*
DirectoryListerTest.*
WebSocketHandshake*
HTTPSRequestTest.*
NetUtilTest.*
-*HTTP*
diff --git a/tools/valgrind/drmemory/suppressions.txt b/tools/valgrind/drmemory/suppressions.txt
index c3ee1e98..18380c0 100644
--- a/tools/valgrind/drmemory/suppressions.txt
+++ b/tools/valgrind/drmemory/suppressions.txt
@@ -190,6 +190,19 @@ UNADDRESSABLE ACCESS
...
*!SetEnvironmentVariable*
+# http://code.google.com/p/drmemory/issues/detail?id=60
+UNINITIALIZED READ
+...
+*!MessageBoxIndirect*
+
+UNINITIALIZED READ
+...
+*!IsDlgButtonChecked*
+
+UNADDRESSABLE ACCESS
+...
+*!MessageBoxIndirect*
+
############################
# TODO(timurrrr): investigate these
UNINITIALIZED READ
@@ -339,4 +352,7 @@ UNINITIALIZED READ
# http://crbug.com/57266 (2)
UNINITIALIZED READ
...
-*!vp8_tokenize_mb
+*!vp8_*
+
+# Empty line at EOF - workaround for
+# http://code.google.com/p/drmemory/issues/detail?id=41