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>
78 lines
2.3 KiB
Text
78 lines
2.3 KiB
Text
# Copyright 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/>.
|
|
|
|
# Utilities for python-scripting related tests.
|
|
|
|
# Run a command in GDB, and report a failure if a Python exception is thrown.
|
|
# If report_pass is true, report a pass if no exception is thrown.
|
|
|
|
proc gdb_py_test_silent_cmd { cmd name report_pass } {
|
|
global gdb_prompt
|
|
|
|
gdb_test_multiple $cmd $name {
|
|
-re "Traceback.*$gdb_prompt $" { fail $name }
|
|
-re "$gdb_prompt $" { if $report_pass { pass $name } }
|
|
}
|
|
}
|
|
|
|
# Return the result of python expression EXPR. DEFAULT is returned if
|
|
# there's an error. TEST is the test message to use. It can be
|
|
# omitted, in which case a test message is built from EXP. This is
|
|
# modeled after get_integer_valueof.
|
|
|
|
proc get_python_valueof { exp default {test ""} } {
|
|
global gdb_prompt
|
|
|
|
if {$test == ""} {
|
|
set test "get python valueof \"${exp}\""
|
|
}
|
|
|
|
set val ${default}
|
|
gdb_test_multiple "python print (\"valueof: %s\" % (${exp}))" "$test" {
|
|
-re "valueof: (\[^\r\n\]*)\[\r\n\]*$gdb_prompt $" {
|
|
set val $expect_out(1,string)
|
|
pass "$test"
|
|
}
|
|
timeout {
|
|
fail "$test (timeout)"
|
|
}
|
|
}
|
|
return ${val}
|
|
}
|
|
|
|
# Return true if Python module NAME is available, otherwise, return
|
|
# false.
|
|
|
|
proc gdb_py_module_available { name } {
|
|
set available "unknown"
|
|
gdb_test_multiple "python import ${name}" "" {
|
|
-re -wrap "ModuleNotFoundError.*: No module named '${name}'.*" {
|
|
set available false
|
|
}
|
|
-re -wrap "ImportError: No module named '?${name}'?.*" {
|
|
set available false
|
|
}
|
|
-re -wrap "python import ${name}" {
|
|
set available true
|
|
}
|
|
}
|
|
|
|
if { $available == "unknown" } {
|
|
perror "unexpected output from python import"
|
|
set available false
|
|
}
|
|
|
|
return ${available}
|
|
}
|