summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 11:29:16 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 11:29:16 +0000
commite2d0ff7cc1b84e4a2121d559635ff236ffea7095 (patch)
treee6dec9be42b1d9a65f2002e66d16623ca5ed44bc
parent5997bea3a514406cb0e5e9233a8fd88274d19b89 (diff)
downloadchromium_src-e2d0ff7cc1b84e4a2121d559635ff236ffea7095.zip
chromium_src-e2d0ff7cc1b84e4a2121d559635ff236ffea7095.tar.gz
chromium_src-e2d0ff7cc1b84e4a2121d559635ff236ffea7095.tar.bz2
Fix analyze on TSan/Win
TBR=glider Review URL: http://codereview.chromium.org/2131016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47653 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xtools/valgrind/valgrind_test.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py
index 18d6446..68cf95b 100755
--- a/tools/valgrind/valgrind_test.py
+++ b/tools/valgrind/valgrind_test.py
@@ -620,8 +620,6 @@ class ThreadSanitizerBase(object):
return ret
def Analyze(self, check_sanity=False):
- if self._options.indirect:
- return self.GetAnalyzeResultsIndirect()
filenames = glob.glob(self.TMP_DIR + "/tsan.*")
use_gdb = common.IsMac()
analyzer = tsan_analyze.TsanAnalyze(self._source_dir, filenames,
@@ -638,6 +636,11 @@ class ThreadSanitizerPosix(ThreadSanitizerBase, ValgrindTool):
ValgrindTool.__init__(self)
ThreadSanitizerBase.__init__(self)
+ def Analyze(self, check_sanity=False):
+ if self._options.indirect:
+ return ValgrindTool.GetAnalyzeResultsIndirect(self)
+ return ThreadSanitizerBase.Analyze(self, check_sanity)
+
def ToolSpecificFlags(self):
proc = ThreadSanitizerBase.ToolSpecificFlags(self)
# The -v flag is needed for printing the list of used suppressions and