darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* lib/gdb.exp (gdb_get_line_number): Throw an

Browse source 
error instead of returning -1.
	* gdb.base/break.exp: Remove unused variable
	bp_location5.
	* gdb.base/hbreak2.exp: Likewise.
	* gdb.base/sepdebug.exp: Likewise.
This commit is contained in:
Keith Seitz 2012-03-09 04:38:53 +00:00
parent f4647387fe
commit 0d7941a9be
5 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,12 @@
2012-03-08 Keith Seitz <keiths@redhat.com>
* lib/gdb.exp (gdb_get_line_number): Throw an
error instead of returning -1.
* gdb.base/break.exp: Remove unused variable
bp_location5.
* gdb.base/hbreak2.exp: Likewise.
* gdb.base/sepdebug.exp: Likewise.
2012-03-08 Yao Qi <yao@codesourcery.com>
Pedro Alves <palves@redhat.com>

1
gdb/testsuite/gdb.base/break.exp
View file

@ -115,7 +115,6 @@ gdb_test "break multi_line_while_conditional" \
"Breakpoint.*at.* file .*$srcfile, line $bp_location4\\." \
"breakpoint at start of multi line while conditional"
set bp_location5 [gdb_get_line_number "set breakpoint 5 here"]
set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
set main_line $bp_location6

1
gdb/testsuite/gdb.base/hbreak2.exp
View file

@ -130,7 +130,6 @@ gdb_test "hbreak multi_line_while_conditional" \
"Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location4\\." \
"hardware breakpoint at start of multi line while conditional"
set bp_location5 [gdb_get_line_number "set breakpoint 5 here"]
set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
set main_line $bp_location6

1
gdb/testsuite/gdb.base/sepdebug.exp
View file

@ -150,7 +150,6 @@ gdb_test "break multi_line_while_conditional" \
"Breakpoint.*at.* file .*$srcfile, line $bp_location4\\." \
"breakpoint at start of multi line while conditional"
set bp_location5 [gdb_get_line_number "set breakpoint 5 here"]
set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
set main_line $bp_location6

15
gdb/testsuite/lib/gdb.exp
View file

@ -3243,7 +3243,7 @@ proc setup_kfail_for_target { PR target } {
# gdb_get_line_number TEXT [FILE]
#
# Search the source file FILE, and return the line number of the
# first line containing TEXT. If no match is found, return -1.
# first line containing TEXT. If no match is found, an error is thrown.
#
# TEXT is a string literal, not a regular expression.
#
@ -3316,15 +3316,13 @@ proc gdb_get_line_number { text { file "" } } {
}
if { [ catch { set fd [open "$file"] } message ] } then {
perror "$message"
return -1
error "$message"
}
set found -1
for { set line 1 } { 1 } { incr line } {
if { [ catch { set nchar [gets "$fd" body] } message ] } then {
perror "$message"
return -1
error "$message"
}
if { $nchar < 0 } then {
break
@ -3336,8 +3334,11 @@ proc gdb_get_line_number { text { file "" } } {
}
if { [ catch { close "$fd" } message ] } then {
perror "$message"
return -1
error "$message"
}
if {$found == -1} {
error "undefined tag \"$text\""
}
return $found