commit ccfa1b51cd0969af2597bd848d68cd427942bc20
author Ian Barkley-Yeung <iby@chromium.org> Fri Jul 07 18:55:46 2023 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jul 10 18:01:43 2023 +0000
tree 36eccad18e95964a2d9c982bb96dab371d056f2e
parent 7842888762d65a4fc836aa18f09088dd13e2d613

scripts: Add complete line to validation messages related to a single line

Any time breakpad symbol validation fails on a particular symbol file line,
add the complete line to the error message. This makes it easier to
debug issues without needing to find the symbol file (which may not get
uploaded) or reproduce the error.

BUG=b:270240549
TEST=Forced errors, examined output
TEST=unit tests

Change-Id: Ie2e41001761549b19cd474dbc9df88193afa9f3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4673853
Reviewed-by: Sergey Frolov <sfrolov@google.com>
Commit-Queue: Sergey Frolov <sfrolov@google.com>
Auto-Submit: Ian Barkley-Yeung <iby@chromium.org>
Tested-by: Ian Barkley-Yeung <iby@chromium.org>

scripts/cros_generate_breakpad_symbols_unittest.py

diff --git a/scripts/cros_generate_breakpad_symbols_unittest.py b/scripts/cros_generate_breakpad_symbols_unittest.py
index 810dada..6801106 100644
--- a/scripts/cros_generate_breakpad_symbols_unittest.py
+++ b/scripts/cros_generate_breakpad_symbols_unittest.py
@@ -917,7 +917,8 @@
         INVALID_SYMBOL_FILES = [
             InvalidSymbolFile(
                 "bad_unknown_line_type.sym",
-                "symbol file has unknown line type UNKNOWN",
+                r"symbol file has unknown line type UNKNOWN "
+                r"\(line='UNKNOWN line type\n'\)",
             ),
             InvalidSymbolFile(
                 "bad_blank_line.sym",
@@ -926,17 +927,17 @@
             InvalidSymbolFile(
                 "bad_short_func.sym",
                 r"symbol file has FUNC line with 2 words "
-                r"\(expected 5 or more\)",
+                r"\(expected 5 or more\) \(line='FUNC fb0\n'\)",
             ),
             InvalidSymbolFile(
                 "bad_short_line_number.sym",
                 r"symbol file has line number line with 3 words "
-                r"\(expected 4 - 4\)",
+                r"\(expected 4 - 4\) \(line='fb0 106 0\n'\)",
             ),
             InvalidSymbolFile(
                 "bad_long_line_number.sym",
                 r"symbol file has line number line with 5 words "
-                r"\(expected 4 - 4\)",
+                r"\(expected 4 - 4\) \(line='c184 7 59 4 8\n'\)",
             ),
         ]