diff options
author | Adrian Prantl <aprantl@apple.com> | 2019-01-24 19:16:45 +0000 |
---|---|---|
committer | Adrian Prantl <aprantl@apple.com> | 2019-01-24 19:16:45 +0000 |
commit | 03f9e25bb0a91cf1b3bea0c62a93aab7518ccde7 (patch) | |
tree | e9274df7d813e7c151fed7cda12e6cbec868c284 /lldb/packages/Python/lldbsuite/test | |
parent | 66b62979b752557a6718cace3d6c91554f46d983 (diff) | |
download | bcm5719-llvm-03f9e25bb0a91cf1b3bea0c62a93aab7518ccde7.tar.gz bcm5719-llvm-03f9e25bb0a91cf1b3bea0c62a93aab7518ccde7.zip |
Unbreak windows bots
llvm-svn: 352086
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbtest.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index f9c21d322da..b969a1992ed 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -1311,15 +1311,16 @@ class Base(unittest2.TestCase): def getDwarfVersion(self): """ Returns the dwarf version generated by clang or 'unknown'. """ - if 'clang' not in self.getCompiler(): - return 'unknown' - driver_output = check_output( - [self.getCompiler()] + '-g -c -x c - -o - -###'.split(), - stderr=STDOUT) - for line in driver_output.split(os.linesep): - m = re.search('dwarf-version=([0-9])', line) - if m: - return m.group(1) + if 'clang' in self.getCompiler(): + try: + driver_output = check_output( + [self.getCompiler()] + '-g -c -x c - -o - -###'.split(), + stderr=STDOUT) + for line in driver_output.split(os.linesep): + m = re.search('dwarf-version=([0-9])', line) + if m: + return m.group(1) + except: pass return 'unknown' def platformIsDarwin(self): |