diff options
| author | Tom de Vries <tdevries@suse.de> | 2020-04-10 09:29:52 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2020-04-10 09:29:52 +0200 |
| commit | bdfc1e8a0b176257bfc700de755463d3aaf69849 (patch) | |
| tree | e6bc80562d94cb41dbdbcd0d129da3801a0e9803 /gdb/testsuite/gdb.base/style.c | |
| parent | 6993bae0747240e6a632233d9700bd72f46fd55d (diff) | |
| download | gdb-bdfc1e8a0b176257bfc700de755463d3aaf69849.zip gdb-bdfc1e8a0b176257bfc700de755463d3aaf69849.tar.gz gdb-bdfc1e8a0b176257bfc700de755463d3aaf69849.tar.bz2 | |
[gdb/cli] Don't let python colorize strip leading newlines
Consider the test-case gdb.base/async.exp. Using the executable, I run to
main, and land on a line advertised as line 26:
...
$ gdb outputs/gdb.base/async/async -ex start
Reading symbols from outputs/gdb.base/async/async...
Temporary breakpoint 1 at 0x4004e4: file gdb.base/async.c, line 26.
Starting program: outputs/gdb.base/async/async
Temporary breakpoint 1, main () at gdb.base/async.c:26
26 y = foo ();
...
But actually, the line turns out to be line 28:
...
$ cat -n gdb.base/async.c
...
26 y = 2;
27 z = 9;
28 y = foo ();
...
This is caused by the following: the python colorizer initializes the lexer
with default options (no second argument to get_lexer_for_filename):
...
def colorize(filename, contents):
# Don't want any errors.
try:
lexer = lexers.get_lexer_for_filename(filename)
formatter = formatters.TerminalFormatter()
return highlight(contents, lexer, formatter)
...
which include option stripnl=True, which strips leading and trailing newlines.
This causes the python colorizer to strip the two leading newlines of async.c.
Fix this by initializing the lexer with stripnl=False.
Build and reg-tested on x86_64-linux.
gdb/ChangeLog:
2020-04-10 Tom de Vries <tdevries@suse.de>
PR cli/25808
* python/lib/gdb/__init__.py: Initialize lexer with stripnl=False.
gdb/testsuite/ChangeLog:
2020-04-10 Tom de Vries <tdevries@suse.de>
PR cli/25808
* gdb.base/style.c: Add leading newlines.
* gdb.base/style.exp: Use gdb_get_line_number to get specific lines.
Check listing of main's one-line body.
Diffstat (limited to 'gdb/testsuite/gdb.base/style.c')
| -rw-r--r-- | gdb/testsuite/gdb.base/style.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.base/style.c b/gdb/testsuite/gdb.base/style.c index cb75b3b..4e0e0df 100644 --- a/gdb/testsuite/gdb.base/style.c +++ b/gdb/testsuite/gdb.base/style.c @@ -1,3 +1,7 @@ + + +/* The leading newlines here are intentional, do not remove. They are used to + test that the source highlighter doesn't strip them. */ /* Copyright 2018-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify |