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 d193498cc1766212a24f473302e19a88284f80c2..bf627f3597a9cdfc96cc71864f6b94e1c01534b4 100644 (file)
--- 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 e3f1df78a76f081f0fbbc67da56f15de918d4c91..1912cd65b42727d23a0edd1124dd3f1a9e4e3f49 100644 (file)
--- 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 cc52eccc6ab61aeac50f4a3da9cd29b087e079ad..ce645b7c7719c788548bbc7ff38132b31b751dc2 100644 (file)
--- 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 771395da669f1e3e40de2ff290fef2317d33e9c3..8de930ef587dffe3cc535045394f1d900f1d4326 100644 (file)
--- 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 c104ea646da9bec49b69bb3ecc503508db5b67f9..fc5c3f94a726d682c0049d64b6eb33fe7956bcea 100644 (file)
--- 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