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>
61 lines
1.7 KiB
Text
61 lines
1.7 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/>.
|
|
|
|
# Test error while loading *-gdb.py. IBM1047 is chosen as possibly supported
|
|
# by glibc but unsupported by Python
|
|
|
|
set testfile "py-error"
|
|
|
|
load_lib gdb-python.exp
|
|
|
|
require allow_python_tests
|
|
|
|
# Start with a fresh gdb.
|
|
gdb_exit
|
|
gdb_start
|
|
|
|
set charset "IBM1047"
|
|
|
|
set test2 "main reached"
|
|
|
|
set test "set host-charset $charset"
|
|
set test_regex [string_to_regexp $test]
|
|
gdb_test_multiple $test $test {
|
|
-re "^$test_regex\r\n$gdb_prompt $" {
|
|
pass $test
|
|
}
|
|
-re "^$test_regex\r\nUndefined item: \"$charset\"\\.\r\n$gdb_prompt $" {
|
|
xfail $test
|
|
untested $test2
|
|
set test2 ""
|
|
}
|
|
}
|
|
|
|
if {$test2 == ""} {
|
|
return 0
|
|
}
|
|
|
|
set remote_python_file [gdb_remote_download host \
|
|
${srcdir}/${subdir}/${testfile}.py]
|
|
|
|
# With the new way that "source" works, it isn't really possible for
|
|
# this to fail "correctly". Converting the filename to a Python
|
|
# unicode object will fail -- and, mysteriously, without setting a
|
|
# real exception.
|
|
gdb_test "source $remote_python_file" \
|
|
"An error occurred in Python.*" \
|
|
$test2
|
|
|
|
gdb_test "p 1" " = 1" "no delayed error"
|