-# Copyright 1998-2013 Free Software Foundation, Inc.
+# Copyright 1998-2017 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
clear_xfail "*-*-*"
-set testfile "jump"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .c
# Build the test case
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
- untested jump.exp
+ untested "failed to compile"
return -1
}
# Start with a fresh gdb
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
if ![runto_main] then {
perror "Couldn't run to main"
# The statement doesn't contain a function call.
#
set bp_on_non_call 0
-gdb_test_multiple "break 22" "break before jump to non-call" {
- -re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 22.*$gdb_prompt $" {
+set non_call_line [gdb_get_line_number "bp-on-non-call"]
+gdb_test_multiple "break $non_call_line" "break before jump to non-call" {
+ -re "\[Bb\]reakpoint (${decimal}) at ${hex}: file .*${srcfile}, line $non_call_line.*$gdb_prompt $" {
set bp_on_non_call $expect_out(1,string)
pass "break before jump to non-call"
}
# Can we jump to the statement? Do we stop there?
#
-gdb_test "jump 22" "Breakpoint \[0-9\]*, .*${srcfile}:22.*" \
+gdb_test "jump $non_call_line" "Breakpoint ${decimal}, .*${srcfile}:$non_call_line.*" \
"jump to non-call"
# Set a breakpoint on the statement that we're about to jump to.
# The statement does contain a function call.
#
set bp_on_call 0
-gdb_test_multiple "break 21" "break before jump to call" {
- -re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 21.*$gdb_prompt $" {
+set call_line [gdb_get_line_number "bp-on-call"]
+gdb_test_multiple "break $call_line" "break before jump to call" {
+ -re "\[Bb\]reakpoint (${decimal}) at ${hex}: file .*${srcfile}, line $call_line.*$gdb_prompt $" {
set bp_on_call $expect_out(1,string)
pass "break before jump to call"
}
# Can we jump to the statement? Do we stop there?
#
-gdb_test "jump 21" \
- "Breakpoint \[0-9\]*, .*${srcfile}:21.*" \
+gdb_test "jump $call_line" \
+ "Breakpoint ${decimal}, .*${srcfile}:$call_line.*" \
"jump to call"
# If we disable the breakpoint at the function call, and then
#
gdb_test_no_output "disable $bp_on_call" "disable breakpoint on call"
-gdb_test "jump 21" "Breakpoint \[0-9\]*, .*${srcfile}:22.*" \
+gdb_test "jump $call_line" "Breakpoint ${decimal}, .*${srcfile}:$non_call_line.*" \
"jump to call with disabled breakpoint"
# Verify that GDB responds gracefully to the "jump" command without
# Verify that GDB responds gracefully to the "jump" command with
# trailing junk.
#
-gdb_test "jump 21 100" \
+gdb_test "jump $call_line 100" \
"malformed linespec error: unexpected number, \"100\"" \
"jump with trailing argument junk"
# Try it both ways: confirming and not confirming the jump.
#
-gdb_test "jump 12" \
+set out_line [gdb_get_line_number "out-of-func"]
+gdb_test "jump $out_line" \
"Not confirmed.*" \
"aborted jump out of current function" \
- "Line 12 is not in `main'. Jump anyway.*y or n. $" \
+ "Line $out_line is not in `main'. Jump anyway.*y or n. $" \
"n"
-gdb_test "jump 12" \
+gdb_test "jump $out_line" \
"Continuing at.*" \
"jump out of current function" \
- "Line 12 is not in `main'. Jump anyway.*y or n. $" \
+ "Line $out_line is not in `main'. Jump anyway.*y or n. $" \
"y"
gdb_exit