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

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

[Tom de Vries]

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

commit 73d9a918c6188ce0f1ec32e42dda063ca16e0362
Author: Tom de Vries <tdevries@suse.de>
Date:   Sun Sep 29 23:51:50 2019 +0200

    [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:
---
 gdb/testsuite/ChangeLog                |  4 ++++
 gdb/testsuite/gdb.dwarf2/gdb-index.exp | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 87f34d6..3dec824 100644
--- 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 6fca3c6..b14e07f 100644
--- 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 ""
+	    }
 	}
     }