diff options
author | Daniel Malea <daniel.malea@intel.com> | 2013-07-30 21:28:32 +0000 |
---|---|---|
committer | Daniel Malea <daniel.malea@intel.com> | 2013-07-30 21:28:32 +0000 |
commit | 1d6437dc04e38fc75a703f188928f95ad7c5d582 (patch) | |
tree | 2fba30c02e104f57582c3b7eb4975687642a41cb | |
parent | 293e35b3f944895603d14d74159d93ab87c0b07d (diff) | |
download | lldb-1d6437dc04e38fc75a703f188928f95ad7c5d582.tar.gz |
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
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@187450 91177308-0d34-0410-b5e6-96231b3b80d8
-rwxr-xr-x | test/dotest.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/dotest.py b/test/dotest.py index 96721d085..3b6d87127 100755 --- a/test/dotest.py +++ b/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() |