summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 09:29:29 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 09:29:29 +0000
commitef8175fff059f8e32ee103df3f348f4e515c7e80 (patch)
tree41943135117e36c300cd866884d67c3f583a5625
parent29315421312c6d7f6c4617e1ba92b8b1729a4e46 (diff)
downloadchromium_src-ef8175fff059f8e32ee103df3f348f4e515c7e80.zip
chromium_src-ef8175fff059f8e32ee103df3f348f4e515c7e80.tar.gz
chromium_src-ef8175fff059f8e32ee103df3f348f4e515c7e80.tar.bz2
Use the winheap allocator for TSan/Win
This should allow us to run much more tests when needed. Some previously-supported tests may show some new true or false reports so we might need to update the suppressions after this lands. BUG=99036 TBR=eugenis Review URL: https://codereview.chromium.org/12212028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180943 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xtools/valgrind/chrome_tests.py5
-rw-r--r--tools/valgrind/valgrind_test.py7
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 64262f1..89c4507 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -257,11 +257,6 @@ class ChromeTests:
return self.SimpleTest("chromeos", "chromeos_unittests")
def TestComponents(self):
- # Skip on TSan/Win bots as it fails on a TCMalloc assertion!
- # See http://crbug.com/99036
- if common.IsWindows() and (self._options.valgrind_tool == "tsan"):
- logging.warning("components_unittests are disabled for TSan on Windows.")
- return 0;
return self.SimpleTest("components", "components_unittests")
def TestCompositor(self):
diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py
index 347bfee..d834cc6 100644
--- a/tools/valgrind/valgrind_test.py
+++ b/tools/valgrind/valgrind_test.py
@@ -744,6 +744,13 @@ class ThreadSanitizerWindows(ThreadSanitizerBase, PinTool):
def ToolSpecificFlags(self):
+ add_env = {
+ "CHROME_ALLOCATOR" : "WINHEAP",
+ }
+ for k,v in add_env.iteritems():
+ logging.info("export %s=%s", k, v)
+ os.putenv(k, v)
+
proc = ThreadSanitizerBase.ToolSpecificFlags(self)
# On PIN, ThreadSanitizer has its own suppression mechanism
# and --log-file flag which work exactly on Valgrind.