[Lldb-commits] [lldb] r155158 - in /lldb/branches/lldb-platform-work: ./ test/dotest.py

[Johnny Chen]

Author: johnny
Date: Thu Apr 19 16:36:47 2012
New Revision: 155158

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

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

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

Propchange: lldb/branches/lldb-platform-work/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 19 16:36:47 2012
@@ -1 +1 @@
-/lldb/trunk:154224-155152
+/lldb/trunk:154224-155157

Modified: lldb/branches/lldb-platform-work/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/dotest.py?rev=155158&r1=155157&r2=155158&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/dotest.py (original)
+++ lldb/branches/lldb-platform-work/test/dotest.py Thu Apr 19 16:36:47 2012
@@ -1275,6 +1275,14 @@
                 # This counts from 1 .. suite.countTestCases().
                 self.counter = 0
 
+            def _exc_info_to_string(self, err, test):
+                """Overrides superclass TestResult's method in order to append
+                our test config info string to the exception info string."""
+                modified_exc_string = '%sConfig=%s-%s' % (super(LLDBTestResult, self)._exc_info_to_string(err, test),
+                                                          test.getArchitecture(),
+                                                          test.getCompiler())
+                return modified_exc_string
+
             def getDescription(self, test):
                 doc_first_line = test.shortDescription()
                 if self.descriptions and doc_first_line: