Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Unified Diff: tools/valgrind/asan/asan_symbolize.py

Issue 823573002: Fix assertions for the dSYM producer in asan_symbolize.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the condition Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/valgrind/asan/asan_symbolize.py
diff --git a/tools/valgrind/asan/asan_symbolize.py b/tools/valgrind/asan/asan_symbolize.py
index dcac186ccfc77354e201a32e3022f0b82dd0631a..8a32681f0156e730db815074f24e8cde29211c18 100755
--- a/tools/valgrind/asan/asan_symbolize.py
+++ b/tools/valgrind/asan/asan_symbolize.py
@@ -68,8 +68,6 @@ def chrome_dsym_hints(binary):
app_positions.append(index)
elif part.endswith('.framework'):
framework_positions.append(index)
- assert len(framework_positions) <= 1, \
- "The path contains more than one framework: %s" % binary
bundle_positions = app_positions + framework_positions
bundle_positions.sort()
assert len(bundle_positions) <= 2, \
@@ -77,9 +75,9 @@ def chrome_dsym_hints(binary):
if len(bundle_positions) == 0:
# Case 1: this is a standalone executable or dylib.
return []
- assert (len(bundle_positions) == 1 or
- len(app_positions) == 2 or
- app_positions[0] < framework_positions[0]), \
+ assert (not (len(app_positions) == 1 and
+ len(framework_positions) == 1 and
+ app_positions[0] < framework_positions[0])), \
"The path contains an app bundle inside a framework: %s" % binary
# Cases 2 and 3. The outermost bundle (which is the only bundle in the case 2)
# is located in the product dir.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698