aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp17
1 files changed, 12 insertions, 5 deletions
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
index 053f722..3827ed7 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
@@ -188,13 +188,20 @@ proc out_line { name cu_dir cu_name line_dir line_name } {
.Lline_${name}_lines:
.byte 3 /* DW_LNS_advance_line */
- .sleb128 998 /* ... to 999 */
+ .sleb128 997 /* ... to 998 */
.byte 0 /* DW_LNE_set_address */
.uleb128 ${addr_len}+1
.byte 2
.${addr_len}byte $name_start
.byte 1 /* DW_LNS_copy */
.byte 3 /* DW_LNS_advance_line */
+ .sleb128 1 /* ... to 999 */
+ .byte 0 /* DW_LNE_set_address */
+ .uleb128 ${addr_len}+1
+ .byte 2
+ .${addr_len}byte ${name}_label
+ .byte 1 /* DW_LNS_copy */
+ .byte 3 /* DW_LNS_advance_line */
.sleb128 1 /* ... to 1000 */
.byte 0 /* DW_LNE_set_address */
.uleb128 ${addr_len}+1
@@ -451,19 +458,19 @@ proc test { func compdir filename } {
}
gdb_breakpoint ${func}_label
- gdb_continue_to_breakpoint $func "$func \\(\\) at .*"
+ gdb_test "continue" "$func \\(\\) at .*" "continue to $func"
gdb_test_no_output "set filename-display absolute"
verbose -log "expect: ${absolute}"
- gdb_test "frame" " in $func \\(\\) at [string_to_regexp ${absolute}]:999" "absolute"
+ gdb_test "frame" "$func \\(\\) at [string_to_regexp ${absolute}]:999" "absolute"
gdb_test_no_output "set filename-display basename"
verbose -log "expect: [file tail $filename]"
- gdb_test "frame" " in $func \\(\\) at [string_to_regexp [file tail $filename]]:999" "basename"
+ gdb_test "frame" "$func \\(\\) at [string_to_regexp [file tail $filename]]:999" "basename"
gdb_test_no_output "set filename-display relative"
verbose -log "expect: $filename"
- gdb_test "frame" " in $func \\(\\) at [string_to_regexp $filename]:999" "relative"
+ gdb_test "frame" "$func \\(\\) at [string_to_regexp $filename]:999" "relative"
}
}