[PATCH] Unset attach_flag when running a new process

[Patrick Palka <patrick@parcs.ath.cx>]

We currently set attach_flag when attaching to a process, so we should
make sure to unset it when forking a new process.  Otherwise attach_flag
would remain set after forking, if the previous process associated with
the inferior was attached to.

[ I fixed the extended-gdbserver test failure by using
  prepare_for_testing instead of using build_executable + gdb_start.  The
  former sets remote exec-file which is what makes the "run" command work as
  expected under extended-gdbserver.  ]

gdb/ChangeLog:

	* gdb/infcmd.c (run_comand_1): Unset attach_flag.

gdb/testsuite/ChangeLog:

	* gdb.base/run-after-attach.exp: New test file.
	* gdb.base/run-after-attach.c: New test file.
---
 gdb/infcmd.c                                |  4 ++
 gdb/testsuite/gdb.base/run-after-attach.c   | 25 +++++++++
 gdb/testsuite/gdb.base/run-after-attach.exp | 80 +++++++++++++++++++++++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 gdb/testsuite/gdb.base/run-after-attach.c
 create mode 100644 gdb/testsuite/gdb.base/run-after-attach.exp

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 4948d27..bf8b94b 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -601,6 +601,10 @@ run_command_1 (char *args, int from_tty, int tbreak_at_main)
   /* Done with ARGS.  */
   do_cleanups (args_chain);
 
+  /* Unset attach_flag, it may be set if the previous process associated with
+     the inferior was attached to.  */
+  current_inferior ()->attach_flag = 0;
+
   /* We call get_inferior_args() because we might need to compute
      the value now.  */
   run_target->to_create_inferior (run_target, exec_file, get_inferior_args (),
diff --git a/gdb/testsuite/gdb.base/run-after-attach.c b/gdb/testsuite/gdb.base/run-after-attach.c
new file mode 100644
index 0000000..2398f00
--- /dev/null
+++ b/gdb/testsuite/gdb.base/run-after-attach.c
@@ -0,0 +1,25 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2015 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/>.  */
+
+#include <unistd.h>
+
+int
+main (void)
+{
+  sleep (600);
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.base/run-after-attach.exp b/gdb/testsuite/gdb.base/run-after-attach.exp
new file mode 100644
index 0000000..5e4ef49
--- /dev/null
+++ b/gdb/testsuite/gdb.base/run-after-attach.exp
@@ -0,0 +1,80 @@
+# Copyright (C) 2015 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/>.
+
+# Check that forking a process after a previous process was attached to unsets
+# attach_flag.  This is done indirectly by inspecting GDB's quit prompt.
+
+if ![can_spawn_for_attach] {
+    return 0
+}
+
+standard_testfile
+set executable $testfile
+
+if [prepare_for_testing $testfile.exp $executable] {
+    return -1
+}
+
+set testpid [spawn_wait_for_attach $binfile]
+
+set test "attach to process"
+gdb_test "attach $testpid" "Attaching to program.*" $test
+
+set test "kill process"
+send_gdb "kill\n"
+gdb_expect {
+    -re ".y or n. $" {
+	send_gdb "y\n"
+	exp_continue
+    }
+    -re "$gdb_prompt $" {
+	pass $test
+    }
+    default {
+	fail $test
+    }
+}
+
+set test "restart process"
+gdb_test "start" "Starting program.*Temporary breakpoint .*" $test
+
+set test "attempt kill via quit"
+send_gdb "quit\n"
+set ok 0
+# The quit prompt should warn about killing the process, not about detaching the
+# process, since this process was not attached to.
+gdb_expect {
+    -re "will be killed.*.y or n. $" {
+	set ok 1
+	send_gdb "n\n"
+	exp_continue
+    }
+    -re "will be detached.*.y or n. $" {
+	send_gdb "n\n"
+	exp_continue
+    }
+    -re "$gdb_prompt $" {
+	if $ok {
+	    pass $test
+	} else {
+	    fail $test
+	}
+    }
+    default {
+	fail $test
+    }
+}
+
+remote_exec host "kill $testpid"
-- 
2.5.0.rc2.22.g69b1679.dirty