diff options
| author | Tom Tromey <tromey@adacore.com> | 2024-02-15 13:14:43 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2024-02-27 09:46:31 -0700 |
| commit | a207f6b3a384897be1dab081a0a9a206593029de (patch) | |
| tree | efd01c313bd5d3e926450662d0e799708a808198 /gdb/testsuite/gdb.python/py-progspace.exp | |
| parent | 8ee6f71b1a09f4077e22c840a16833518c56089a (diff) | |
| download | binutils-a207f6b3a384897be1dab081a0a9a206593029de.zip binutils-a207f6b3a384897be1dab081a0a9a206593029de.tar.gz binutils-a207f6b3a384897be1dab081a0a9a206593029de.tar.bz2 | |
Rewrite "python" command exception handling
The "python" command (and the Python implementation of the gdb
"source" command) does not handle Python exceptions in the same way as
other gdb-facing Python code. In particular, exceptions are turned
into a generic error rather than being routed through
gdbpy_handle_exception, which takes care of converting to 'quit' as
appropriate.
I think this was done this way because PyRun_SimpleFile and friends do
not propagate the Python exception -- they simply indicate that one
occurred.
This patch reimplements these functions to respect the general gdb
convention here. As a bonus, some Windows-specific code can be
removed, as can the _execute_file function.
The bulk of this change is tweaking the test suite to match the new
way that exceptions are displayed. These changes are largely
uninteresting. However, it's worth pointing out the py-error.exp
change. Here, the failure changes because the test changes the host
charset to something that isn't supported by Python. This then
results in a weird error in the new setup.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31354
Acked-By: Tom de Vries <tdevries@suse.de>
Reviewed-By: Eli Zaretskii <eliz@gnu.org>
Diffstat (limited to 'gdb/testsuite/gdb.python/py-progspace.exp')
| -rw-r--r-- | gdb/testsuite/gdb.python/py-progspace.exp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gdb/testsuite/gdb.python/py-progspace.exp b/gdb/testsuite/gdb.python/py-progspace.exp index f76e1f9..0ae5b56 100644 --- a/gdb/testsuite/gdb.python/py-progspace.exp +++ b/gdb/testsuite/gdb.python/py-progspace.exp @@ -55,8 +55,8 @@ gdb_test "python print (progspace.random_attribute)" "42" \ # Check that we can't create new (invalid) gdb.Progspace objects. gdb_test "python gdb.Progspace()" \ - [multi_line "TypeError: cannot create 'gdb.Progspace' instances" \ - "Error while executing Python code\\."] \ + [multi_line "TypeError.*: cannot create 'gdb.Progspace' instances" \ + "Error occurred in Python.*"] \ "check for error when calling gdb.Progspace() directly" if {![runto_main]} { @@ -111,7 +111,7 @@ gdb_py_test_silent_cmd "python progspace2 = gdb.current_progspace()" \ gdb_test "inferior 1" "Switching to inferior 1.*" gdb_test_no_output "remove-inferiors 2" gdb_test "python print (progspace2.objfiles ())" \ - "RuntimeError: Program space no longer exists.*" + "RuntimeError.*: Program space no longer exists.*" gdb_test "python print (progspace2.symbol_file)" \ - "RuntimeError: Program space no longer exists.*" + "RuntimeError.*: Program space no longer exists.*" |