gdb.base/interrupt.exp: Rename saw_eof to saw_end_of_file

To avoid confusion between "end of file" string matching and eof
matching, as in process exit.

gdb/testsuite/ChangeLog:
2015-04-23  Pedro Alves  <palves@redhat.com>

	* gdb.base/interrupt.exp: Rename saw_eof to saw_end_of_file.
This commit is contained in:
Pedro Alves 2015-04-23 15:48:27 +01:00
parent 749ef8f891
commit 0a8031692e
2 changed files with 11 additions and 7 deletions

View File

@ -1,3 +1,7 @@
2015-04-23 Pedro Alves <palves@redhat.com>
* gdb.base/interrupt.exp: Rename saw_eof to saw_end_of_file.
2015-04-23 Pedro Alves <palves@redhat.com>
* lib/gdb.exp (gdb_test_multiple): Match eof/full_buffer/timeout

View File

@ -200,16 +200,16 @@ if ![file exists $binfile] then {
}
}
set saw_eof 0
set saw_end_of_file 0
set saw_inferior_exit 0
set msg "send end of file"
send_inferior "\004"
gdb_test_multiple "" $msg {
-i "$inferior_spawn_id" -re "end of file" {
verbose -log "saw eof: $saw_eof"
set saw_eof 1
verbose -log "saw eof"
-i $inferior_spawn_id -re "end of file" {
verbose -log "saw \"end of file\": $saw_end_of_file"
set saw_end_of_file 1
verbose -log "saw \"end of file\""
if {!$saw_inferior_exit} {
exp_continue
}
@ -217,13 +217,13 @@ if ![file exists $binfile] then {
-i "$gdb_spawn_id" -re "$inferior_exited_re normally.*$gdb_prompt " {
set saw_inferior_exit 1
verbose -log "saw inferior exit"
if {!$saw_eof} {
if {!$saw_end_of_file} {
exp_continue
}
}
}
gdb_assert { $saw_eof && $saw_inferior_exit } $msg
gdb_assert { $saw_end_of_file && $saw_inferior_exit } $msg
}
}
return 0