[binutils-gdb] [gdb/testsuite] Fix duplicate test-names in gdb.{gdb, opt, xml}

[binutils-gdb] [gdb/testsuite] Fix duplicate test-names in gdb.{gdb, opt, xml}

[Tom de Vries]

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

commit c9f3b40e1ad5ea299e7725951bb78222fefcdf51
Author: Tom de Vries <tdevries@suse.de>
Date:   Tue May 12 10:28:44 2020 +0200

    [gdb/testsuite] Fix duplicate test-names in gdb.{gdb,opt,xml}
    
    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.
    
    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.

Diff:
---
 gdb/testsuite/ChangeLog                 | 6 ++++++
 gdb/testsuite/gdb.gdb/complaints.exp    | 8 +++++---
 gdb/testsuite/gdb.opt/inline-locals.exp | 2 +-
 gdb/testsuite/gdb.xml/tdesc-regs.exp    | 8 +++++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 53181b685a6..b76359e4867 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2020-05-12  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.dwarf2/comp-unit-lang.exp: Use with_test_prefix.
diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp
index b4a5ab30870..922530caa50 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 3dee0aabfe4..8104b0f5b73 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 1ec20a19449..bb04420b246 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"
+}