a207f6b3a3
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>
116 lines
3.4 KiB
Text
116 lines
3.4 KiB
Text
# Copyright (C) 2010-2024 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# This file is part of the GDB testsuite. It tests python pretty
|
|
# printer registration.
|
|
|
|
load_lib gdb-python.exp
|
|
|
|
require allow_python_tests
|
|
|
|
standard_testfile
|
|
|
|
if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
|
|
return -1
|
|
}
|
|
|
|
set remote_python_file [gdb_remote_download host \
|
|
${srcdir}/${subdir}/${testfile}.py]
|
|
|
|
if ![runto_main ] {
|
|
return -1
|
|
}
|
|
|
|
proc prepare_test { } {
|
|
global testfile remote_python_file
|
|
|
|
# Start with a fresh gdb.
|
|
clean_restart ${testfile}
|
|
|
|
set run_to_here [gdb_get_line_number {break to inspect} ${testfile}.c ]
|
|
if ![runto ${testfile}.c:$run_to_here] {
|
|
return 0
|
|
}
|
|
|
|
gdb_test_no_output "source ${remote_python_file}" "read file"
|
|
|
|
gdb_test_no_output "py progspace = gdb.current_progspace()"
|
|
gdb_test_no_output "py my_pretty_printer1 = build_pretty_printer1()"
|
|
gdb_test_no_output "py my_pretty_printer2 = build_pretty_printer2()"
|
|
|
|
return 1
|
|
}
|
|
|
|
proc test_printers { s_prefix } {
|
|
global hex
|
|
|
|
gdb_test "print flt" " = x=<42> y=<43>"
|
|
gdb_test "print s" " = ${s_prefix} a=<1> b=<$hex>"
|
|
}
|
|
|
|
# Test registration with verbose off.
|
|
|
|
with_test_prefix "verbose off" {
|
|
if ![prepare_test] {
|
|
return -1
|
|
}
|
|
|
|
gdb_test_no_output "set verbose off"
|
|
|
|
gdb_test_no_output "py gdb.printing.register_pretty_printer(gdb, lookup_function_lookup_test)"
|
|
gdb_test_no_output "py gdb.printing.register_pretty_printer(progspace, my_pretty_printer1)"
|
|
|
|
test_printers "s1"
|
|
}
|
|
|
|
# Test registration with verbose on.
|
|
|
|
with_test_prefix "verbose on" {
|
|
if ![prepare_test] {
|
|
return -1
|
|
}
|
|
|
|
gdb_test_no_output "set verbose on"
|
|
|
|
gdb_test "py gdb.printing.register_pretty_printer(gdb, lookup_function_lookup_test)" \
|
|
"Registering global lookup_function_lookup_test pretty-printer ..."
|
|
gdb_test "py gdb.printing.register_pretty_printer(progspace, my_pretty_printer1)" \
|
|
"Registering pp-test pretty-printer for .*py-pp-registration ..."
|
|
|
|
test_printers "s1"
|
|
}
|
|
|
|
# Exercise the "replace" argument to register_pretty_printer.
|
|
|
|
with_test_prefix "replace" {
|
|
if ![prepare_test] {
|
|
return -1
|
|
}
|
|
|
|
gdb_test_no_output "py gdb.printing.register_pretty_printer(gdb, lookup_function_lookup_test)"
|
|
gdb_test_no_output "py gdb.printing.register_pretty_printer(progspace, my_pretty_printer1)"
|
|
gdb_test "py gdb.printing.register_pretty_printer(progspace, my_pretty_printer2, replace=False)" \
|
|
"RuntimeError.*: pretty-printer already registered: pp-test\r\nError occurred in Python.*"
|
|
|
|
with_test_prefix "test printers 1" {
|
|
test_printers "s1"
|
|
}
|
|
|
|
gdb_test_no_output "py gdb.printing.register_pretty_printer(progspace, my_pretty_printer2, replace=True)"
|
|
|
|
with_test_prefix "test printers 2" {
|
|
test_printers "s2"
|
|
}
|
|
}
|