This revision was automatically updated to reflect the committed changes.
Closed by commit rG4da5a446f818: [lldb] Update crashlog.py to accept multiple
results from mdfind (authored by JDevlieghere).
Herald added a project: LLDB.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D109263/new/
https://reviews.llvm.org/D109263
Files:
lldb/examples/python/crashlog.py
Index: lldb/examples/python/crashlog.py
===================================================================
--- lldb/examples/python/crashlog.py
+++ lldb/examples/python/crashlog.py
@@ -293,18 +293,24 @@
return False
if not self.resolved_path and not os.path.exists(self.path):
try:
- dsym = subprocess.check_output(
+ mdfind_results = subprocess.check_output(
["/usr/bin/mdfind",
- "com_apple_xcode_dsym_uuids ==
%s"%uuid_str]).decode("utf-8")[:-1]
- if dsym and os.path.exists(dsym):
- print(('falling back to binary inside "%s"'%dsym))
- self.symfile = dsym
+ "com_apple_xcode_dsym_uuids == %s" %
uuid_str]).decode("utf-8").splitlines()
+ found_matching_slice = False
+ for dsym in mdfind_results:
dwarf_dir = os.path.join(dsym,
'Contents/Resources/DWARF')
+ if not os.path.exists(dwarf_dir):
+ # Not a dSYM bundle, probably an Xcode archive.
+ continue
+ print('falling back to binary inside "%s"' % dsym)
+ self.symfile = dsym
for filename in os.listdir(dwarf_dir):
- self.path = os.path.join(dwarf_dir, filename)
- if not self.find_matching_slice():
- return False
- break
+ self.path = os.path.join(dwarf_dir, filename)
+ if self.find_matching_slice():
+ found_matching_slice = True
+ break
+ if found_matching_slice:
+ break
except:
pass
if (self.resolved_path and os.path.exists(self.resolved_path)) or (
Index: lldb/examples/python/crashlog.py
===================================================================
--- lldb/examples/python/crashlog.py
+++ lldb/examples/python/crashlog.py
@@ -293,18 +293,24 @@
return False
if not self.resolved_path and not os.path.exists(self.path):
try:
- dsym = subprocess.check_output(
+ mdfind_results = subprocess.check_output(
["/usr/bin/mdfind",
- "com_apple_xcode_dsym_uuids == %s"%uuid_str]).decode("utf-8")[:-1]
- if dsym and os.path.exists(dsym):
- print(('falling back to binary inside "%s"'%dsym))
- self.symfile = dsym
+ "com_apple_xcode_dsym_uuids == %s" % uuid_str]).decode("utf-8").splitlines()
+ found_matching_slice = False
+ for dsym in mdfind_results:
dwarf_dir = os.path.join(dsym, 'Contents/Resources/DWARF')
+ if not os.path.exists(dwarf_dir):
+ # Not a dSYM bundle, probably an Xcode archive.
+ continue
+ print('falling back to binary inside "%s"' % dsym)
+ self.symfile = dsym
for filename in os.listdir(dwarf_dir):
- self.path = os.path.join(dwarf_dir, filename)
- if not self.find_matching_slice():
- return False
- break
+ self.path = os.path.join(dwarf_dir, filename)
+ if self.find_matching_slice():
+ found_matching_slice = True
+ break
+ if found_matching_slice:
+ break
except:
pass
if (self.resolved_path and os.path.exists(self.resolved_path)) or (
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
