From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [committed][gdb/testsuite] Fix duplicate test-names in gdb.{gdb,opt,xml}
Date: Tue, 12 May 2020 10:29:17 +0200 [thread overview]
Message-ID: <20200512082915.GA24388@delia> (raw)
Hi,
There are 3 test directories with one duplicate test-name: gdb.gdb, gdb.opt
and gdb.xml. The duplicates are:
...
DUPLICATE: gdb.gdb/complaints.exp: call complaint_internal ($cstr)
DUPLICATE: gdb.opt/inline-locals.exp: info locals above bar 2 \
(PRMS: gdb/25695)
DUPLICATE: gdb.xml/tdesc-regs.exp: ptype $extrareg
...
Fix as appropriate.
Tested on x86_64-linux.
Committed to trunk.
Thanks,
- Tom
[gdb/testsuite] Fix duplicate test-names in gdb.{gdb,opt,xml}
gdb/testsuite/ChangeLog:
2020-05-12 Tom de Vries <tdevries@suse.de>
* gdb.gdb/complaints.exp: Use with_test_prefix.
* gdb.xml/tdesc-regs.exp: Same.
* gdb.opt/inline-locals.exp: Fix test name.
---
gdb/testsuite/gdb.gdb/complaints.exp | 8 +++++---
gdb/testsuite/gdb.opt/inline-locals.exp | 2 +-
gdb/testsuite/gdb.xml/tdesc-regs.exp | 8 +++++---
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp
index b4a5ab3087..922530caa5 100644
--- a/gdb/testsuite/gdb.gdb/complaints.exp
+++ b/gdb/testsuite/gdb.gdb/complaints.exp
@@ -65,9 +65,11 @@ proc test_initial_complaints { } {
"During symbol reading: Register a complaint"
# Re-issue the first message #1
- gdb_test_stdio \
- "call complaint_internal (\$cstr)" \
- "During symbol reading: Register a complaint"
+ with_test_prefix "re-issue" {
+ gdb_test_stdio \
+ "call complaint_internal (\$cstr)" \
+ "During symbol reading: Register a complaint"
+ }
# Add a second complaint, expect it
gdb_test_stdio \
diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp
index 3dee0aabfe..8104b0f5b7 100644
--- a/gdb/testsuite/gdb.opt/inline-locals.exp
+++ b/gdb/testsuite/gdb.opt/inline-locals.exp
@@ -95,7 +95,7 @@ if { ! $no_frames } {
set pass_re "array = {$decimal, \[^\r\n\]*}"
set kfail_re [multi_line $pass_re \
"array = {<optimized out> <repeats 64 times>}"]
- gdb_test_multiple "info locals" "info locals above bar 2" {
+ gdb_test_multiple "info locals" "info locals above bar 3" {
-re -wrap $pass_re {
pass $gdb_test_name
}
diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp
index 1ec20a1944..bb04420b24 100644
--- a/gdb/testsuite/gdb.xml/tdesc-regs.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp
@@ -184,6 +184,8 @@ gdb_test "ptype \$mixed_flags" \
gdb_test "maintenance print reggroups" \
" Group\[ \t\]+Type\[ \t\]+\r\n.* general\[ \t\]+user\[ \t\]+\r\n.* foo\[ \t\]+user\[ \t\]+"
-load_description "core-only.xml" "" "test-regs.xml"
-# The extra register from the previous description should be gone.
-gdb_test "ptype \$extrareg" "type = void"
+with_test_prefix "core-only.xml" {
+ load_description "core-only.xml" "" "test-regs.xml"
+ # The extra register from the previous description should be gone.
+ gdb_test "ptype \$extrareg" "type = void"
+}
reply other threads:[~2020-05-12 8:29 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=20200512082915.GA24388@delia \
--to=tdevries@suse.de \
--cc=gdb-patches@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).