[PATCH] Add remove-inferiors test

[PATCH] Add remove-inferiors test

[Simon Marchi]

I noticed that the remove-inferiors command was not tested, and as I am
doing some changes related to the user selection, I want to make sure I
don't break it.  For example, I want to make sure it's not possible to
remove the current inferior.

gdb/testsuite/ChangeLog:

	* gdb.multi/remove-inferiors.exp: New file.
	* gdb.multi/remove-inferiors.c: New file.
---
 gdb/testsuite/gdb.multi/remove-inferiors.c   | 23 +++++++++
 gdb/testsuite/gdb.multi/remove-inferiors.exp | 70 ++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 gdb/testsuite/gdb.multi/remove-inferiors.c
 create mode 100644 gdb/testsuite/gdb.multi/remove-inferiors.exp

diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.c b/gdb/testsuite/gdb.multi/remove-inferiors.c
new file mode 100644
index 0000000..f78199f
--- /dev/null
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.c
@@ -0,0 +1,23 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2016 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+int
+main (void)
+{
+  return 0;
+}
+
diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
new file mode 100644
index 0000000..c49b31d
--- /dev/null
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -0,0 +1,70 @@
+# Copyright 2016 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+standard_testfile
+
+if { [build_executable ${testfile}.exp ${binfile} "${srcfile}" {debug}] != 0 } {
+    return -1
+}
+
+proc switch_to_inferior { num message } {
+    gdb_test "inferior ${num}" \
+	     "\\\[Switching to inferior ${num} \\\[<null>\\\] \\\(<noexec>\\\)\\\]" \
+	     "${message}"
+}
+
+proc add_inferior { expected_num message } {
+    gdb_test "add-inferior" "Added inferior ${expected_num}" "${message}"
+}
+
+proc test_remove_inferiors { } {
+    global binfile
+
+    clean_restart ${binfile}
+
+    # Add another inferior and switch to it.
+    add_inferior 2 "add second inferior"
+    switch_to_inferior 2 "switch to second inferior"
+
+    # Test that it is not possible to remove the current inferior.
+    gdb_test "remove-inferiors 2" \
+	     "warning: Can not remove current symbol inferior 2." \
+	     "can't remove current inferior"
+
+    # Test that it is possible to remove a non-active non-current inferior.
+    gdb_test_no_output "remove-inferiors 1" "remove non-current inferior"
+
+    # Load binfile and start the inferior.
+    set binfile_re [string_to_regexp ${binfile}]
+    gdb_test "file ${binfile}" \
+	     "Reading symbols from ${binfile_re}...done." \
+	     "load binary"
+
+    if {![runto_main]} {
+	fail "Couldn't run to main."
+	return
+    }
+
+    # Add another inferior and switch to it.
+    add_inferior 3 "add third inferior"
+    switch_to_inferior 3 "switch to third inferior"
+
+    # Test that it is not possible to remove an active non-current inferior.
+    gdb_test "remove-inferiors 2" \
+	     "warning: Can not remove active inferior 2." \
+	     "can't remove active inferior"
+}
+
+test_remove_inferiors
-- 
2.9.3

Re: [PATCH] Add remove-inferiors test

[Pedro Alves]

On 08/17/2016 06:12 PM, Simon Marchi wrote:

> gdb/testsuite/ChangeLog:
> 
> 	* gdb.multi/remove-inferiors.exp: New file.
> 	* gdb.multi/remove-inferiors.c: New file.

OK.

> +proc test_remove_inferiors { } {
> +    global binfile
> +
> +    clean_restart ${binfile}
> +
> +    # Add another inferior and switch to it.
> +    add_inferior 2 "add second inferior"
> +    switch_to_inferior 2 "switch to second inferior"
> +
> +    # Test that it is not possible to remove the current inferior.
> +    gdb_test "remove-inferiors 2" \
> +	     "warning: Can not remove current symbol inferior 2." \
> +	     "can't remove current inferior"

Eh, this "symbol inferior" reference sounds like a bad
global replace on my part, years ago.  The original multi-exec
support called program spaces "symbol spaces" instead.

Follow up patch to remove that stray "symbol" preapproved.

Thanks,
Pedro Alves

Re: [PATCH] Add remove-inferiors test

[Simon Marchi]

On 16-08-17 02:49 PM, Pedro Alves wrote:
> On 08/17/2016 06:12 PM, Simon Marchi wrote:
> 
>> gdb/testsuite/ChangeLog:
>>
>> 	* gdb.multi/remove-inferiors.exp: New file.
>> 	* gdb.multi/remove-inferiors.c: New file.
> 
> OK.
> 
>> +proc test_remove_inferiors { } {
>> +    global binfile
>> +
>> +    clean_restart ${binfile}
>> +
>> +    # Add another inferior and switch to it.
>> +    add_inferior 2 "add second inferior"
>> +    switch_to_inferior 2 "switch to second inferior"
>> +
>> +    # Test that it is not possible to remove the current inferior.
>> +    gdb_test "remove-inferiors 2" \
>> +	     "warning: Can not remove current symbol inferior 2." \
>> +	     "can't remove current inferior"
> 
> Eh, this "symbol inferior" reference sounds like a bad
> global replace on my part, years ago.  The original multi-exec
> support called program spaces "symbol spaces" instead.
> 
> Follow up patch to remove that stray "symbol" preapproved.

Ahh that explains it, I thought it was odd but didn't think about
it too much.

Pushed the main patch, as well as this one that fixes the error message:


From eb2332d78d4ef40a2696aa0f6c833ea26a739efc Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Wed, 17 Aug 2016 16:02:27 -0400
Subject: [PATCH] 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.
---
 gdb/ChangeLog                                | 4 ++++
 gdb/inferior.c                               | 2 +-
 gdb/testsuite/ChangeLog                      | 5 +++++
 gdb/testsuite/gdb.multi/remove-inferiors.exp | 2 +-
 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.
-- 
2.9.3