[gdb/testsuite] Make pass message unique in gdb-index.exp for cc-with-dwz-m

With cc-with-dwz-m, we get:
...
PASS: gdb.dwarf2/gdb-index.exp: objcopy
PASS: gdb.dwarf2/gdb-index.exp: objcopy
...

Make the pass message unique by using with_test_prefix:
...
PASS: gdb.dwarf2/gdb-index.exp: objcopy
PASS: gdb.dwarf2/gdb-index.exp: modify dwz file: objcopy
...

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2019-09-29  Tom de Vries  <tdevries@suse.de>

	* gdb.dwarf2/gdb-index.exp: Use with_test_prefix for second objcopy.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 87f34d62987b92d02d813deb2b830dc7005ec93c..3dec82464555e650444cb54cc8aa586d14b71988 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-29  Tom de Vries  <tdevries@suse.de>
+
+       * gdb.dwarf2/gdb-index.exp: Use with_test_prefix for second objcopy.
+
 2019-09-27  Tom de Vries  <tdevries@suse.de>
 
        * gdb.reverse/step-precsave.exp: Add missing $gdb_prompt in regexps.

diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-index.exp
index 6fca3c6129924faf3af60b5e412726428de35cef..b14e07fa55dab3ef0db3fe7314441845925d31c7 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/gdb-index.exp
+++ b/gdb/testsuite/gdb.dwarf2/gdb-index.exp
@@ -59,14 +59,16 @@ proc add_gdb_index { program } {
        return ""
     }
 
-    if { [remote_file host exists ${dwz_index_file}] } {
-       # We're modifying $dwz in place, otherwise we'd have to update
-       # .gnu_debugaltlink in $program.
-       set args [join [list "--remove-section .gdb_index" \
-                           " --add-section .gdb_index=$dwz_index_file" \
-                           " --set-section-flags .gdb_index=readonly $dwz"]]
-       if {[run_on_host "objcopy" [gdb_find_objcopy] "$args"]} {
-           return ""
+    with_test_prefix "modify dwz file" {
+       if { [remote_file host exists ${dwz_index_file}] } {
+           # We're modifying $dwz in place, otherwise we'd have to update
+           # .gnu_debugaltlink in $program.
+           set args [join [list "--remove-section .gdb_index" \
+                               " --add-section .gdb_index=$dwz_index_file" \
+                               " --set-section-flags .gdb_index=readonly $dwz"]]
+           if {[run_on_host "objcopy" [gdb_find_objcopy] "$args"]} {
+               return ""
+           }
        }
     }