public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Tom de Vries <vries@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] [gdb/testsuite] Handle quotes in gdb_py_module_available
Date: Mon, 13 Jun 2022 11:00:00 +0000 (GMT)	[thread overview]
Message-ID: <20220613110000.DAA913850431@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=f25123df34b037c7f5b3f25eddb7baa1de2befef

commit f25123df34b037c7f5b3f25eddb7baa1de2befef
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Jun 13 12:59:56 2022 +0200

    [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.

Diff:
---
 gdb/testsuite/lib/gdb-python.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/lib/gdb-python.exp b/gdb/testsuite/lib/gdb-python.exp
index d5039bbd099..3f004283f08 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}" {


                 reply	other threads:[~2022-06-13 11:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220613110000.DAA913850431@sourceware.org \
    --to=vries@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).