tsan_analyze.py now assumes that all ThreadSanitizer reports contain VIM folds.

Review URL: http://codereview.chromium.org/3156050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57519 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 20 deletions

diff --git a/tools/valgrind/tsan_analyze.py b/tools/valgrind/tsan_analyze.py
index 43e4544..cb4b403 100644
--- a/tools/valgrind/tsan_analyze.py
+++ b/tools/valgrind/tsan_analyze.py
@@ -83,9 +83,7 @@ class TsanAnalyzer:
       TheAddressTable.Add(stack_trace_line.binary, stack_trace_line.address)
       self.stack_trace_line_ = stack_trace_line
 
-  # TODO(glider): merge Read*Section once TSan is fixed to print {{{ and }}}
-  # around all reports.
-  def ReadRaceSection(self):
+  def ReadSection(self):
     result = [self.line_]
     if re.search("{{{", self.line_):
       while not re.search('}}}', self.line_):
@@ -96,18 +94,6 @@ class TsanAnalyzer:
           result.append(self.stack_trace_line_)
     return result
 
-  def ReadWarningSection(self):
-    result = [self.line_]
-    self.ReadLine()
-    while TsanAnalyzer.TSAN_WARNING_LINE_RE.match(self.line_):
-      self.ReadLine()
-      if self.stack_trace_line_ is None:
-        result.append(self.line_)
-      else:
-        result.append(self.stack_trace_line_)
-    return result
-
-
   def ParseReportFile(self, filename):
     self.cur_fd_ = open(filename, 'r')
 
@@ -119,16 +105,14 @@ class TsanAnalyzer:
 
       tmp = []
       while re.search(TsanAnalyzer.THREAD_CREATION_STR, self.line_):
-        # TODO(glider): that's not really a race section but rather an {{{...}}}
-        # but use this wrong name to quick-fix the script.
-        tmp.extend(self.ReadRaceSection())
+        tmp.extend(self.ReadSection())
         self.ReadLine()
       if re.search(TsanAnalyzer.TSAN_RACE_DESCRIPTION, self.line_):
-        tmp.extend(self.ReadRaceSection())
+        tmp.extend(self.ReadSection())
         self.reports.append(tmp)
       if (re.search(TsanAnalyzer.TSAN_WARNING_DESCRIPTION, self.line_) and
           not common.IsWindows()): # workaround for http://crbug.com/53198
-        tmp.extend(self.ReadWarningSection())
+        tmp.extend(self.ReadSection())
         self.reports.append(tmp)
 
       match = re.search(" used_suppression:\s+([0-9]+)\s(.*)", self.line_)