mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
f25123df34
On openSUSE Leap 42.3 with python 3.4, I run into: ... (gdb) python import pygments^M Traceback (most recent call last):^M File "<string>", line 1, in <module>^M ImportError: No module named 'pygments'^M Error while executing Python code.^M (gdb) FAIL: gdb.base/style.exp: python import pygments ERROR: unexpected output from python import ... because gdb_py_module_available doesn't handle the single quotes around the module name in the ImportError. Fix this by allowing the single quotes. Tested on x86_64-linux.
79 lines
2.3 KiB
Plaintext
79 lines
2.3 KiB
Plaintext
# Copyright 2010-2022 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}
|
|
}
|