[binutils-gdb] btrace, testsuite: fix extended-remote fail

[Markus Metzger <mmetzger at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=68777c298919d6dbdb9537c92a64ed9440ef6f3c

commit 68777c298919d6dbdb9537c92a64ed9440ef6f3c
Author: Markus Metzger <markus.t.metzger@intel.com>
Date:   Thu Jan 26 15:07:44 2017 +0100

    btrace, testsuite: fix extended-remote fail
    
    Parts of gdb.btrace/enable.exp are only valid for native debug.  The check for
    skip_gdbserver_tests is done while GDB is running, though, which causes it to
    fail with --target_board=native-extended-gdbserver.  Exit GDB before that check.
    
    testsuite/
    	* gdb.btrace/enable.exp: Call gdb_exit before skip_gdbserver_tests.

Diff:
---
 gdb/testsuite/ChangeLog             | 5 +++++
 gdb/testsuite/gdb.btrace/enable.exp | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3e0a5da..99cb9fe 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2017-02-01  Markus Metzger  <markus.t.metzger@intel.com>
 
+	* gdb.btrace/enable.exp: Call gdb_exit before
+	skip_gdbserver_tests.
+
+2017-02-01  Markus Metzger  <markus.t.metzger@intel.com>
+
 	* gdb.btrace/non-stop.exp: Add '-ex "set non-stop on"' to
 	GDBFLAGS.
 
diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp
index be20c08..61abe0b 100644
--- a/gdb/testsuite/gdb.btrace/enable.exp
+++ b/gdb/testsuite/gdb.btrace/enable.exp
@@ -74,6 +74,9 @@ gdb_test "record btrace" "The process is already being recorded\\.  Use \"record
 # continue to the end and make sure we don't die
 gdb_test "continue" ".*Inferior.*exited.*" "continue to end"
 
+# skip_gdbserver_tests requires GDB not running.
+gdb_exit
+
 # skip the rerun test when using gdbserver
 # otherwise rerun twice, target should be automatically disabled
 load_lib gdbserver-support.exp