aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.dwarf2/gdb-index.exp18
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 ""
+ }
}
}