aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2008-03-21 14:39:23 +0000
committerDaniel Jacobowitz <drow@false.org>2008-03-21 14:39:23 +0000
commitb21991b00cf16b94e9646a054e786c1fa4d5501a (patch)
treec3ed986846aff1ccd230c0e4ef8041672fe6640c
parentbbeee7eaea4dc0c8145299850787e50172438270 (diff)
downloadgdb-b21991b00cf16b94e9646a054e786c1fa4d5501a.zip
gdb-b21991b00cf16b94e9646a054e786c1fa4d5501a.tar.gz
gdb-b21991b00cf16b94e9646a054e786c1fa4d5501a.tar.bz2
* top.c (quit_confirm): Warn that we will kill the program.
* gdb.threads/killed.exp, gdb.threads/manythreads.exp, gdb.threads/staticthreads.exp: Update exit query.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.threads/killed.exp2
-rw-r--r--gdb/testsuite/gdb.threads/manythreads.exp2
-rw-r--r--gdb/testsuite/gdb.threads/staticthreads.exp2
-rw-r--r--gdb/top.c2
6 files changed, 13 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 85b76fe..638b8d9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-21 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * top.c (quit_confirm): Warn that we will kill the program.
+
2008-03-19 Pedro Alves <pedro@codesourcery.com>
* inflow.c (terminal_ours_1): Guard access to
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 30fba70..3e5f867 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-21 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * gdb.threads/killed.exp, gdb.threads/manythreads.exp,
+ gdb.threads/staticthreads.exp: Update exit query.
+
2008-03-07 Sandra Loosemore <sandra@codesourcery.com>
* lib/gdb.exp (gdb_load_cmd): Fix $args typo in timeout error message.
diff --git a/gdb/testsuite/gdb.threads/killed.exp b/gdb/testsuite/gdb.threads/killed.exp
index 167e060..9633dfb 100644
--- a/gdb/testsuite/gdb.threads/killed.exp
+++ b/gdb/testsuite/gdb.threads/killed.exp
@@ -87,7 +87,7 @@ gdb_expect {
# Try to quit.
send_gdb "quit\n"
gdb_expect {
- -re "The program is running. Exit anyway\\? \\(y or n\\) $" {
+ -re "The program is running. Quit anyway \\(and kill it\\)\\? \\(y or n\\) $" {
send_gdb "y\n"
exp_continue
}
diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp
index 182aa6f..a92d049 100644
--- a/gdb/testsuite/gdb.threads/manythreads.exp
+++ b/gdb/testsuite/gdb.threads/manythreads.exp
@@ -133,7 +133,7 @@ gdb_test_multiple "" "stop threads 2" {
}
gdb_test_multiple "quit" "GDB exits after stopping multithreaded program" {
- -re "The program is running. Exit anyway\\? \\(y or n\\) $" {
+ -re "The program is running. Quit anyway \\(and kill it\\)\\? \\(y or n\\) $" {
send_gdb "y\n"
exp_continue
}
diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp
index 95b8d24..6453e0b 100644
--- a/gdb/testsuite/gdb.threads/staticthreads.exp
+++ b/gdb/testsuite/gdb.threads/staticthreads.exp
@@ -91,7 +91,7 @@ gdb_test_multiple "info threads" "$test" {
set test "GDB exits with static thread program"
gdb_test_multiple "quit" "$test" {
- -re "The program is running. Exit anyway\\? \\(y or n\\) $" {
+ -re "The program is running. Quit anyway \\(and kill it\\)\\? \\(y or n\\) $" {
send_gdb "y\n"
exp_continue
}
diff --git a/gdb/top.c b/gdb/top.c
index 379f0b7..418ff8e 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -1253,7 +1253,7 @@ quit_confirm (void)
else if (attach_flag)
s = "The program is running. Quit anyway (and detach it)? ";
else
- s = "The program is running. Exit anyway? ";
+ s = "The program is running. Quit anyway (and kill it)? ";
if (!query ("%s", s))
return 0;