[Lldb-commits] [lldb] r155171 - in /lldb/branches/lldb-platform-work: ./ test/lldbbench.py

[Johnny Chen]

Author: johnny
Date: Thu Apr 19 18:55:58 2012
New Revision: 155171

URL: http://llvm.org/viewvc/llvm-project?rev=155171&view=rev
Log:
Merge r155170 from ToT:

svn merge -r 155157:155170 https://johnny@llvm.org/svn/llvm-project/lldb/trunk .

Modified:
    lldb/branches/lldb-platform-work/   (props changed)
    lldb/branches/lldb-platform-work/test/lldbbench.py

Propchange: lldb/branches/lldb-platform-work/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 19 18:55:58 2012
@@ -1 +1 @@
-/lldb/trunk:154224-155157
+/lldb/trunk:154224-155170

Modified: lldb/branches/lldb-platform-work/test/lldbbench.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/lldbbench.py?rev=155171&r1=155170&r2=155171&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/lldbbench.py (original)
+++ lldb/branches/lldb-platform-work/test/lldbbench.py Thu Apr 19 18:55:58 2012
@@ -106,7 +106,7 @@
 
     def tearDown(self):
         """Fixture for unittest test case teardown."""
-        super(BenchBase, self).setUp()
+        super(BenchBase, self).tearDown()
         #TestBase.tearDown(self)
         del self.stopwatch