diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 07:30:26 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 07:30:26 +0000 |
| commit | 2c9382375f1bcea32b7fdbf165fffdd39e046f0b (patch) | |
| tree | 58c4aafe1de8043b7f55d702d620fe66028c2206 /tools | |
| parent | bcbf5369fdc23704aa0848f79c7ed8fffd0eaf89 (diff) | |
| download | chromium_src-2c9382375f1bcea32b7fdbf165fffdd39e046f0b.zip chromium_src-2c9382375f1bcea32b7fdbf165fffdd39e046f0b.tar.gz chromium_src-2c9382375f1bcea32b7fdbf165fffdd39e046f0b.tar.bz2 | |
Exclude IPHLPAPI.DLL from TSAN instrumentation.
Remove exclusion for DnsConfigService.*GetSystemConfig to test if it still
occasionally crashes after that.
TBR=timurrrr@chromium.org
NOTRY=true
BUG=118874,146119
Review URL: https://chromiumcodereview.appspot.com/10917056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt | 3 | ||||
| -rw-r--r-- | tools/valgrind/tsan/ignores_win32.txt | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt index 93ff8bd..962990e 100644 --- a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt +++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt @@ -24,8 +24,5 @@ SSLClientSocketTest.* # See http://crbug.com/104805 HostResolverImplTest.AbortOnlyExistingRequestsOnIPAddressChange -# Fails, see http://crbug.com/118874 -DnsConfigServiceTest.*GetSystemConfig - # Times out occasionally, http://crbug.com/124452 HostResolverImplTest.StartWithinCallback diff --git a/tools/valgrind/tsan/ignores_win32.txt b/tools/valgrind/tsan/ignores_win32.txt index 0d5375b..cdb5789 100644 --- a/tools/valgrind/tsan/ignores_win32.txt +++ b/tools/valgrind/tsan/ignores_win32.txt @@ -12,6 +12,10 @@ fun_r:*CryptAcquireContext* obj:*WINHTTP.dll obj:*imagehlp.dll +# Instrumenting IP Helper API causes crashes. +# TODO(szym): investigate http://crbug.com/146119 +obj:*IPHLPAPI.dll + # Use less detailed instrumentation of STL fun_hist:*std::*<* # Don't instrument some stl internals - they shouldn't be useful |