From: Richard Earnshaw <rearnsha@arm.com>
Date: Tue, 16 Sep 2025 16:43:39 +0000 (+0100)
Subject: ld: testsuite: arm: Fix duplicate test names.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75e10462f6776dfde22b800415eef5928cb9caf3;p=thirdparty%2Fbinutils-gdb.git

ld: testsuite: arm: Fix duplicate test names.

Rename some tests to avoid ambiguity in the test names.  I've changed several
of the Thumb2 BL testnames to more accurately reflect the nature of the tests
(some omitted 'bad' even when testing for errors, but that then led to other
naming conflicts...).
---

diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index d193498cc17..bf627f3597a 100644
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -338,7 +338,7 @@ set tmp {
      "-shared -T arm-dyn.ld --hash-style=sysv" "" "" {gc-thumb-lib.s}
      {}
      "gc-thumb-lib.so"}
-    {"Thumb and -gc-sections" "-pie -T arm.ld -gc-sections tmpdir/gc-thumb-lib.so" "" "" {gc-thumb.s}
+    {"Thumb and -gc-sections (pie)" "-pie -T arm.ld -gc-sections tmpdir/gc-thumb-lib.so" "" "" {gc-thumb.s}
      {{readelf --relocs gc-thumb.d}}
      "gc-thumb"}
     {"Simple non-PIC shared library" "-shared" "" "" {arm-lib.s}
@@ -444,7 +444,7 @@ if { ![istarget "arm*-*-*eabi*"] } {
 	{"Thumb-2-as-Thumb-1 BL" "-Ttext 0x1000 --section-start .foo=0x100100c" "" "" {thumb2-bl-as-thumb1-bad.s}
 	    {{objdump -d thumb2-bl-as-thumb1-bad-noeabi.d}}
 	    "thumb2-bl-as-thumb1-bad"}
-	{"Thumb-2 BL bad" "-Ttext 0x1000 --section-start .foo=0x100100c" "" "" {thumb2-bl-bad.s}
+	{"Thumb-2 BL bad noeabi" "-Ttext 0x1000 --section-start .foo=0x100100c" "" "" {thumb2-bl-bad.s}
 	    {{objdump -d thumb2-bl-bad-noeabi.d}}
 	    "thumb2-bl-bad"}
     }
@@ -646,7 +646,7 @@ set armeabitests {
     {"Thumb-2-as-Thumb-1 BL" "--no-fix-arm1176 -Ttext 0x1000 --section-start .foo=0x100100c" "" "" {thumb2-bl-as-thumb1-bad.s}
      {{objdump -d thumb2-bl-as-thumb1-bad.d}}
      "thumb2-bl-as-thumb1-bad"}
-    {"Thumb-2 BL" "-Ttext 0x1000 --section-start .foo=0x100100c" "" "" {thumb2-bl-bad.s}
+    {"Thumb-2 BL bad" "-Ttext 0x1000 --section-start .foo=0x100100c" "" "" {thumb2-bl-bad.s}
      {{objdump -d thumb2-bl-bad.d}}
      "thumb2-bl-bad"}
     {"Branch to linker script symbol with BL for thumb-only target" "-T branch-lks-sym.ld" "" "" {thumb-bl-lks-sym.s}
@@ -681,7 +681,7 @@ set armeabitests {
      {{objdump -d fix-arm1176-off.d}}
      "fix-arm1176-6"}
 
-     {"Thumb-2 BL" "-Ttext 0x1000 --section-start .foo=0x1001000" "" "-march=armv7" {thumb2-bl.s}
+     {"Thumb-2 BL on armv7" "-Ttext 0x1000 --section-start .foo=0x1001000" "" "-march=armv7" {thumb2-bl.s}
       {{objdump -dr thumb2-bl.d}}
       "thumb2-bl"}
      {"Thumb-2 BL on ARMv6-M" "-Ttext 0x1000 --section-start .foo=0x1001000" "" "-march=armv6-m" {thumb2-bl.s}
diff --git a/ld/testsuite/ld-arm/group-relocs-alu-bad-2.d b/ld/testsuite/ld-arm/group-relocs-alu-bad-2.d
index e3f1df78a76..1912cd65b42 100644
--- a/ld/testsuite/ld-arm/group-relocs-alu-bad-2.d
+++ b/ld/testsuite/ld-arm/group-relocs-alu-bad-2.d
@@ -1,4 +1,4 @@
-#name: ALU group relocations failure test
+#name: ALU group relocations failure test (2)
 #source: group-relocs-alu-bad-2.s
 #ld: -Ttext 0x8000 --section-start foo=0x1208000
 #error: overflow whilst splitting 0x1234 for group relocation
diff --git a/ld/testsuite/ld-arm/group-relocs-ldc-bad-2.d b/ld/testsuite/ld-arm/group-relocs-ldc-bad-2.d
index cc52eccc6ab..ce645b7c771 100644
--- a/ld/testsuite/ld-arm/group-relocs-ldc-bad-2.d
+++ b/ld/testsuite/ld-arm/group-relocs-ldc-bad-2.d
@@ -1,4 +1,4 @@
-#name: LDC group relocations failure test
+#name: LDC group relocations failure test (2)
 #source: group-relocs-ldc-bad-2.s
 #ld: -Ttext 0x8000 --section-start foo=0x118400
 #error: overflow whilst splitting 0x123456 for group relocation
diff --git a/ld/testsuite/ld-arm/group-relocs-ldr-bad-2.d b/ld/testsuite/ld-arm/group-relocs-ldr-bad-2.d
index 771395da669..8de930ef587 100644
--- a/ld/testsuite/ld-arm/group-relocs-ldr-bad-2.d
+++ b/ld/testsuite/ld-arm/group-relocs-ldr-bad-2.d
@@ -1,4 +1,4 @@
-#name: LDR group relocations failure test
+#name: LDR group relocations failure test (2)
 #source: group-relocs-ldr-bad-2.s
 #ld: -Ttext 0x8000 --section-start foo=0x8001000
 #error: .*overflow whilst splitting 0x7ff9000 for group relocation.*
diff --git a/ld/testsuite/ld-arm/group-relocs-ldrs-bad-2.d b/ld/testsuite/ld-arm/group-relocs-ldrs-bad-2.d
index c104ea646da..fc5c3f94a72 100644
--- a/ld/testsuite/ld-arm/group-relocs-ldrs-bad-2.d
+++ b/ld/testsuite/ld-arm/group-relocs-ldrs-bad-2.d
@@ -1,4 +1,4 @@
-#name: LDRS group relocations failure test
+#name: LDRS group relocations failure test (2)
 #source: group-relocs-ldrs-bad-2.s
 #ld: -Ttext 0x8000 --section-start foo=0x8000100
 #error: overflow whilst splitting 0x7ff8100 for group relocation