This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] gdb.base/interrupt.exp: Rename saw_eof to saw_end_of_file
- From: Pedro Alves <palves at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 23 Apr 2015 14:56:53 -0000
- Subject: [binutils-gdb] gdb.base/interrupt.exp: Rename saw_eof to saw_end_of_file
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0a8031692eac62e2b3d74789d56cdfb38a5f91b0
commit 0a8031692eac62e2b3d74789d56cdfb38a5f91b0
Author: Pedro Alves <palves@redhat.com>
Date: Thu Apr 23 15:48:27 2015 +0100
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.
Diff:
---
gdb/testsuite/ChangeLog | 4 ++++
gdb/testsuite/gdb.base/interrupt.exp | 14 +++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c77bf3c..71fdd48 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
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
on $any_spawn_id instead of only on $gdb_spawn_id.
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index d093ff5..17a9bad 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -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