From: Daniel Malea <daniel.malea@intel.com>
Date: Tue, 30 Jul 2013 21:28:32 +0000 (+0000)
Subject: Fix problematic override _exc_info_to_string
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bbd174b6f0046bb03f5c424f1766007d198461e1;p=platform%2Fupstream%2Fllvm.git

Fix problematic override _exc_info_to_string
- pass through to base-class implementation when raised exception is not from an LLDBTest
- should make the test suite errors a little easier to root-cause

llvm-svn: 187450
---

diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index 96721d0..3b6d871 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -1427,10 +1427,12 @@ for ia in range(len(archs) if iterArchs else 1):
             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
+                if hasattr(test, "getArchitecture") and hasattr(test, "getCompiler"):
+                    return '%sConfig=%s-%s' % (super(LLDBTestResult, self)._exc_info_to_string(err, test),
+                                                              test.getArchitecture(),
+                                                              test.getCompiler())
+                else:
+                    return super(LLDBTestResult, self)._exc_info_to_string(err, test)
 
             def getDescription(self, test):
                 doc_first_line = test.shortDescription()