From: Andrew Burgess via Gdb-patches <gdb-patches@sourceware.org>
To: Simon Marchi <simark@simark.ca>, gdb-patches@sourceware.org
Subject: Re: [PATCH 2/3] gdb: improve disassembler styling when Pygments raises an exception
Date: Sat, 08 Oct 2022 17:00:13 +0100 [thread overview]
Message-ID: <87wn9ae25u.fsf@redhat.com> (raw)
In-Reply-To: <15cf0c9f-81ae-9bc8-79ba-e5b4eb1f0412@simark.ca>
Simon Marchi <simark@simark.ca> writes:
>> +# Check that, if the user is using Python Pygments for disassembler
>> +# styling, then the styling correctly switches off when an error is
>> +# detected in the Python code.
>> +proc test_disassembler_error_handling { } {
>> +
>> + # This test requires the Python Pygments module to be installed
>> + # and used by GDB.
>> + if { !$::python_disassembly_styling } {
>> + return
>> + }
>> +
>> + save_vars { env(TERM) } {
>> + # We need an ANSI-capable terminal to get the output.
>> + setenv TERM ansi
>> +
>> + # Restart GDB with the correct TERM variable setting, this
>> + # means that GDB will enable styling.
>> + clean_restart_and_disable "restart 4" $::binfile
>> +
>> + # Disable use of libopcodes for styling. As this function is
>> + # only called when Python Pygments module is available, we
>> + # should now be using that module to style the disassembler
>> + # output.
>> + gdb_test_no_output "maint set libopcodes-styling enabled off"
>> +
>> + # Disassemble a single instruction and ensure that the output
>> + # has styling markers in it.
>> + set insn_before [get_single_disassembled_insn]
>> + gdb_assert { [regexp "\033" $insn_before] } \
>> + "have style markers when Pygments is working fine"
>> +
>> + # Now replace the standard function that colorizes the
>> + # disassembler output, with a new function that always returns
>> + # None, this should cause GDB to stop using the Pygments
>> + # module for disassembler styling.
>> + gdb_py_test_silent_cmd \
>> + [multi_line_input \
>> + "python" \
>> + "def replacement_colorize_disasm(content,gdbarch):" \
>> + " return None" \
>> + "gdb.styling.colorize_disasm = replacement_colorize_disasm" \
>> + "\004"] \
>
> Any reason you are using \004 here, instead of end? I don't quite
> understand why, but it seems to cause some random failures. Running the
> test under `taskset -c 2` makes it fail most of the time. Running it
> with check-read1 makes it fail consistently:
>
> FAIL: gdb.base/style.exp: capture_command_output for x/1i *main
>
> When changing \004 for end, it passes. I don't have an explanation why
> though.
It'll be a copy&paste. There's a couple of other places in the
testsuite where this pattern is used.
The patch below changes all three to use 'end'. How's this?
Thanks,
Andrew
---
commit eccf885d59a785cc3d9a76bd75184a9b9420f6b9
Author: Andrew Burgess <aburgess@redhat.com>
Date: Sat Oct 8 16:58:00 2022 +0100
gdb/testsuite: use 'end' and the end of python blocks
Use the keyword 'end' to terminate blocks of Python code being sent to
GDB, rather than sending \004.
diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp
index c6ed996c280..146e2b6d757 100644
--- a/gdb/testsuite/gdb.base/style.exp
+++ b/gdb/testsuite/gdb.base/style.exp
@@ -444,7 +444,7 @@ proc test_disassembler_error_handling { } {
"def replacement_colorize_disasm(content,gdbarch):" \
" return None" \
"gdb.styling.colorize_disasm = replacement_colorize_disasm" \
- "\004"] \
+ "end"] \
"setup replacement colorize_disasm function" \
true
diff --git a/gdb/testsuite/gdb.python/py-arch-reg-groups.exp b/gdb/testsuite/gdb.python/py-arch-reg-groups.exp
index 9503e6c10f5..f2cf8b0e6ec 100644
--- a/gdb/testsuite/gdb.python/py-arch-reg-groups.exp
+++ b/gdb/testsuite/gdb.python/py-arch-reg-groups.exp
@@ -102,5 +102,5 @@ gdb_py_test_silent_cmd \
" raise gdb.GdbError (\"miss-matched names\")" \
" if (r1 != r2):" \
" raise gdb.GdbError (\"miss-matched objects\")" \
- "\004" ] \
+ "end" ] \
"check names and objects match" 1
diff --git a/gdb/testsuite/gdb.python/py-arch-reg-names.exp b/gdb/testsuite/gdb.python/py-arch-reg-names.exp
index d3c600ffc0f..62c47e8200e 100644
--- a/gdb/testsuite/gdb.python/py-arch-reg-names.exp
+++ b/gdb/testsuite/gdb.python/py-arch-reg-names.exp
@@ -102,7 +102,7 @@ gdb_py_test_silent_cmd \
" raise gdb.GdbError (\"miss-matched names\")" \
" if (r1 != r2):" \
" raise gdb.GdbError (\"miss-matched objects\")" \
- "\004" ] \
+ "end" ] \
"check names and objects match" 1
# Ensure that the '.find' method on the iterator returns the same
next prev parent reply other threads:[~2022-10-08 16:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 14:16 [PATCH 0/3] Improvements for Pygments based disassembly styling Andrew Burgess via Gdb-patches
2022-08-30 14:16 ` [PATCH 1/3] gdb/testsuite: extend styling test for libopcodes styling Andrew Burgess via Gdb-patches
2022-08-30 14:16 ` [PATCH 2/3] gdb: improve disassembler styling when Pygments raises an exception Andrew Burgess via Gdb-patches
2022-10-08 2:25 ` Simon Marchi via Gdb-patches
2022-10-08 16:00 ` Andrew Burgess via Gdb-patches [this message]
2022-10-08 16:01 ` Simon Marchi via Gdb-patches
2022-10-10 9:32 ` Andrew Burgess via Gdb-patches
2022-10-10 10:31 ` Tom de Vries via Gdb-patches
2022-10-10 11:16 ` Andrew Burgess via Gdb-patches
2022-10-10 13:22 ` Tom de Vries via Gdb-patches
2022-10-10 14:04 ` Andrew Burgess via Gdb-patches
2022-10-10 11:03 ` Andrew Burgess via Gdb-patches
2022-08-30 14:16 ` [PATCH 3/3] gdb/disasm: better intel flavour disassembly styling with Pygments Andrew Burgess via Gdb-patches
2022-10-02 16:38 ` [PATCH 0/3] Improvements for Pygments based disassembly styling Andrew Burgess via Gdb-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wn9ae25u.fsf@redhat.com \
--to=gdb-patches@sourceware.org \
--cc=aburgess@redhat.com \
--cc=simark@simark.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox