diff --git a/gdb/testsuite/gdb.multi/multi-exit.c b/gdb/testsuite/gdb.multi/multi-exit.c
new file mode 100644
index 0000000..d94b807
--- /dev/null
+++ b/gdb/testsuite/gdb.multi/multi-exit.c
@@ -0,0 +1,22 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2019 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 . */
+
+int
+main ()
+{
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.multi/multi-exit.exp b/gdb/testsuite/gdb.multi/multi-exit.exp
new file mode 100644
index 0000000..6281e51
--- /dev/null
+++ b/gdb/testsuite/gdb.multi/multi-exit.exp
@@ -0,0 +1,46 @@
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 2019 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 .
+
+# Test receiving exit events from multiple inferiors.
+
+standard_testfile
+
+if {![can_spawn_for_attach]} {
+ return 0
+}
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
+ return -1
+}
+
+if {![runto_main]} {
+ fail "starting inferior 1"
+ return -1
+}
+
+gdb_test "add-inferior -exec $binfile"
+gdb_test "inferior 2" ".*Switching to inferior 2.*"
+
+if {![runto_main]} {
+ fail "starting inferior 2"
+ return -1
+}
+
+# We want both processes in a running state.
+gdb_test_no_output "set schedule-multiple on"
+
+gdb_continue_to_end
diff --git a/gdb/testsuite/gdb.multi/multi-kill.c b/gdb/testsuite/gdb.multi/multi-kill.c
new file mode 100644
index 0000000..aa2e2e9
--- /dev/null
+++ b/gdb/testsuite/gdb.multi/multi-kill.c
@@ -0,0 +1,34 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2019 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 . */
+
+/* This program is intended to be started outside of gdb, and then
+ attached to by gdb. */
+
+#include
+
+int
+main ()
+{
+ /* Don't run forever in case GSB crashes and DejaGNU fails to kill
+ this program. */
+ alarm (10);
+
+ while (1)
+ ;
+
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.multi/multi-kill.exp b/gdb/testsuite/gdb.multi/multi-kill.exp
new file mode 100644
index 0000000..40665f8
--- /dev/null
+++ b/gdb/testsuite/gdb.multi/multi-kill.exp
@@ -0,0 +1,85 @@
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 2019 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 .
+
+# Test receiving exit events from multiple inferiors.
+
+standard_testfile
+
+if {![can_spawn_for_attach]} {
+ return 0
+}
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
+ return -1
+}
+
+# Start the programs, attach to them, then kill both from outside.
+# GDB would pick one of the stop events and process it. In the
+# all-stop mode, GDB will try to stop the other inferior, which is
+# also dead. GDB should be able to handle this case and give back the
+# prompt.
+
+set spawn_id_list [spawn_wait_for_attach [list $binfile $binfile]]
+set test_spawn_id1 [lindex $spawn_id_list 0]
+set test_spawn_id2 [lindex $spawn_id_list 1]
+set testpid1 [spawn_id_get_pid $test_spawn_id1]
+set testpid2 [spawn_id_get_pid $test_spawn_id2]
+
+gdb_test "attach $testpid1" \
+ "Attaching to program: .*, process $testpid1.*(in|at).*" \
+ "attach to program 1"
+
+gdb_test "add-inferior -exec $binfile" "Added inferior 2.*"
+
+gdb_test "inferior 2" ".*Switching to inferior 2.*" \
+ "switch to second inferior"
+
+gdb_test "attach $testpid2" \
+ "Attaching to program: .*, process $testpid2.*(in|at).*" \
+ "attach to program 2"
+
+# We want both processes in a running state.
+gdb_test_no_output "set schedule-multiple on"
+
+send_gdb "continue\n"
+gdb_expect {
+ -re "Continuing." {
+ # nothing; keep going.
+ }
+ default {
+ untested "could not continue"
+ return -1
+ }
+}
+
+# Kill both processes at once.
+remote_exec build "kill -9 ${testpid1} ${testpid2}"
+
+# We should get back the gdb prompt.
+set testname "back to gdb prompt"
+gdb_expect {
+ -re "Program terminated with signal.*$gdb_prompt" {
+ pass $testname
+ }
+ default {
+ fail $testname
+ }
+}
+
+# Make sure that the processes are gone.
+kill_wait_spawned_process $test_spawn_id1
+kill_wait_spawned_process $test_spawn_id2