aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/inferior.c2
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.multi/remove-inferiors.exp2
4 files changed, 11 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51504a0..dbd90dd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2016-08-17 Simon Marchi <simon.marchi@ericsson.com>
+ * inferior.c (remove_inferior_command): Fix error message.
+
+2016-08-17 Simon Marchi <simon.marchi@ericsson.com>
+
* inferior.c (exit_inferior_1): Remove comment.
2016-08-15 Matthew Wahab <matthew.wahab@arm.com>
diff --git a/gdb/inferior.c b/gdb/inferior.c
index 6507ae7..47d91c7 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -803,7 +803,7 @@ remove_inferior_command (char *args, int from_tty)
if (inf == current_inferior ())
{
- warning (_("Can not remove current symbol inferior %d."), num);
+ warning (_("Can not remove current inferior %d."), num);
continue;
}
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6e01da2..d025133 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2016-08-17 Simon Marchi <simon.marchi@ericsson.com>
+ * gdb.multi/remove-inferiors.exp (test_remove_inferiors): Fix
+ expected error message.
+
+2016-08-17 Simon Marchi <simon.marchi@ericsson.com>
+
* gdb.multi/remove-inferiors.exp: New file.
* gdb.multi/remove-inferiors.c: New file.
diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index c49b31d..d46beec 100644
--- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -40,7 +40,7 @@ proc test_remove_inferiors { } {
# Test that it is not possible to remove the current inferior.
gdb_test "remove-inferiors 2" \
- "warning: Can not remove current symbol inferior 2." \
+ "warning: Can not remove current inferior 2." \
"can't remove current inferior"
# Test that it is possible to remove a non-active non-current inferior.