From 03f9e25bb0a91cf1b3bea0c62a93aab7518ccde7 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Thu, 24 Jan 2019 19:16:45 +0000 Subject: [PATCH] Unbreak windows bots llvm-svn: 352086 --- .../Python/lldbsuite/test/lldbtest.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index f9c21d322da2..b969a1992ed2 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): -- 2.34.1