From: Tom de Vries <tdevries@suse.de>
Date: Fri, 24 Sep 2021 10:39:15 +0000 (+0200)
Subject: [gdb/testsuite] Fix DUPLICATEs in gdb.dwarf2/implptr-64bit.exp
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8f2441d856b3b57bbd3b3c60496ca30678f1b8f;p=binutils-gdb.git

[gdb/testsuite] Fix DUPLICATEs in gdb.dwarf2/implptr-64bit.exp

When running test-case gdb.dwarf2/implptr-64bit.exp with target board
unix/-m32, I noticed:
...
DUPLICATE: gdb.dwarf2/implptr-64bit.exp: failed to prepare
...

Fix this by using with_test_prefix.

Tested on x86_64-linux.
---

diff --git a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
index 03bf8c8977e..19f5ecb7929 100644
--- a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
+++ b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
@@ -21,11 +21,9 @@ if {![dwarf2_support]} {
 
 standard_testfile main.c
 
-proc test { dwarf_version offset_size addr_size ref_addr_size two_cu } {
+proc test_1 { name dwarf_version offset_size addr_size ref_addr_size two_cu } {
     global testfile srcfile
 
-    set name "d${dwarf_version}o${offset_size}a${addr_size}r${ref_addr_size}t${two_cu}"
-
     # Make some DWARF for the test.
     set asm_file [standard_output_file ${testfile}-${name}.S]
     Dwarf::assemble $asm_file {
@@ -137,7 +135,23 @@ proc test { dwarf_version offset_size addr_size ref_addr_size two_cu } {
 	return -1
     }
 
-    gdb_test "p/x p->f" " = 0x1010101" $name
+    gdb_test "p/x p->f" " = 0x1010101"
+}
+
+proc test { dwarf_version offset_size addr_size ref_addr_size two_cu } {
+
+    set name \
+	[list \
+	     "d${dwarf_version}" \
+	     "o${offset_size}" \
+	     "a${addr_size}" \
+	     "r${ref_addr_size}" \
+	     "t${two_cu}"]
+    set name [join $name "-"]
+    with_test_prefix $name {
+	test_1 $name \
+	    $dwarf_version $offset_size $addr_size $ref_addr_size $two_cu
+    }
 }
 
 #    DWARF_VERSION OFFSET_SIZE ADDR_SIZE REF_ADDR_SIZE TWO_CU