aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2022-06-13 12:59:56 +0200
committerTom de Vries <tdevries@suse.de>2022-06-13 12:59:56 +0200
commitf25123df34b037c7f5b3f25eddb7baa1de2befef (patch)
tree5f25179974e0b764a8b3d32578327b00d0b68d0d
parent8025a164287b588f450686a4b81f6001c33e4269 (diff)
downloadgdb-f25123df34b037c7f5b3f25eddb7baa1de2befef.zip
gdb-f25123df34b037c7f5b3f25eddb7baa1de2befef.tar.gz
gdb-f25123df34b037c7f5b3f25eddb7baa1de2befef.tar.bz2
[gdb/testsuite] Handle quotes in gdb_py_module_available
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.
-rw-r--r--gdb/testsuite/lib/gdb-python.exp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/testsuite/lib/gdb-python.exp b/gdb/testsuite/lib/gdb-python.exp
index d5039bb..3f00428 100644
--- a/gdb/testsuite/lib/gdb-python.exp
+++ b/gdb/testsuite/lib/gdb-python.exp
@@ -61,7 +61,7 @@ proc gdb_py_module_available { name } {
-re -wrap "ModuleNotFoundError: No module named '${name}'.*" {
set available false
}
- -re -wrap "ImportError: No module named ${name}.*" {
+ -re -wrap "ImportError: No module named '?${name}'?.*" {
set available false
}
-re -wrap "python import ${name}" {