Fix remove-inferior error message

This error message should not contain the word symbol:

  (gdb) remove-inferiors 1
  Warning: Can not remove current symbol inferior 1.

gdb/ChangeLog:

	* inferior.c (remove_inferior_command): Fix error message.

gdb/testsuite/ChangeLog:

	* gdb.multi/remove-inferiors.exp (test_remove_inferiors): Fix
	expected error message.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51504a02d0261a9e699dfbc47e569d667938eca3..dbd90ddb17a610d63c1c054da4561f12df358860 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/gdb/inferior.c b/gdb/inferior.c
index 6507ae77db19b88651e2ccbd2203ff2e402ee7cf..47d91c7037e6563f72a7e7acd008c3871088d8d8 100644 (file)
--- 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 6e01da285aa4ef7413b81bff121c4319136aec2e..d025133d9eb955af6eb83b08620de706aad437c6 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index c49b31d4e991628722c1da83227a804915f559e3..d46beec0a9de91fef71d394cfc83e745adb1db52 100644 (file)
--- 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.