From: Tom Tromey <tromey@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org, Tom Tromey <tromey@adacore.com>
Subject: [PATCH] Relax type-printer regexp in libstdc++ test suite
Date: Wed, 28 Jun 2023 09:57:03 -0600 [thread overview]
Message-ID: <20230628155703.2948377-1-tromey@adacore.com> (raw)
The libstdc++ test suite checks whether gdb type printers are
available like so:
set do_whatis_tests [gdb_batch_check "python print(gdb.type_printers)" \
"\\\[\\\]"]
This regexp assumes that the list of printers is empty. However,
sometimes it's convenient to ship a gdb that comes with some default
printers, causing this to erroneously report that gdb is "too old".
I believe the intent of this check is to ensure that gdb.type_printers
exists -- not to check its starting value. This patch changes the
check to accept any Python list as output.
Note that the patch doesn't look for the trailing "]". I tried this
but in my case the output was too long for expect. It seemed fine to
just check the start, as the point really is to reject the case where
the command prints an error message.
* testsuite/lib/gdb-test.exp (gdb-test): Relax type-printer
regexp.
---
libstdc++-v3/testsuite/lib/gdb-test.exp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/testsuite/lib/gdb-test.exp b/libstdc++-v3/testsuite/lib/gdb-test.exp
index 3728a060aa4..d8e572ef7b3 100644
--- a/libstdc++-v3/testsuite/lib/gdb-test.exp
+++ b/libstdc++-v3/testsuite/lib/gdb-test.exp
@@ -107,8 +107,12 @@ proc gdb-test { marker {selector {}} {load_xmethods 0} } {
}
}
+ # A very old version of gdb will not have the type_printers
+ # global. Some organizations may ship a gdb that has some default
+ # type printers, so accept any list output as indication that the
+ # global exists.
set do_whatis_tests [gdb_batch_check "python print(gdb.type_printers)" \
- "\\\[\\\]"]
+ "\\\[.+"]
if {!$do_whatis_tests} {
send_log "skipping 'whatis' tests - gdb too old"
}
--
2.40.1
next reply other threads:[~2023-06-28 15:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-28 15:57 Tom Tromey [this message]
2023-06-28 18:05 ` Jonathan Wakely
2023-06-29 16:58 ` Tom Tromey
2023-06-29 18:00 ` Jonathan Wakely
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=20230628155703.2948377-1-tromey@adacore.com \
--to=tromey@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.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).