From 9c211fd8d6c7a600a7e55f272e21a967377a7c87 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Wed, 21 Sep 2016 09:20:12 +0100 Subject: [PATCH] Check the right proc name In lib/gdbserver-support.exp, we rename gdb_exit to gdbserver_orig_gdb_exit, but we check the existence gdbserver_gdb_exit. We should check gdbserver_orig_gdb_exit instead. Looks it is a typo or an oversight. gdb/testsuite: 2016-09-22 Yao Qi * lib/gdbserver-support.exp: Check the existence of gdbserver_orig_gdb_exit rather than gdbserver_gdb_exit. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/gdbserver-support.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5d0669d801..fb0ca38356 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-09-22 Yao Qi + + * lib/gdbserver-support.exp: Check the existence of + gdbserver_orig_gdb_exit rather than gdbserver_gdb_exit. + 2016-09-21 Anton Kolesov * gdb.xml/tdesc-regs.exp: set core-regs for arc*-*-elf32. diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index c0f17cd004..70c8a5f9f0 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -358,7 +358,7 @@ proc close_gdbserver {} { # Hook into GDB exit, and close GDBserver. -if { [info procs gdbserver_gdb_exit] == "" } { +if { [info procs gdbserver_orig_gdb_exit] == "" } { rename gdb_exit gdbserver_orig_gdb_exit } proc gdb_exit {} { -- 2.34.1