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 --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3e0a5da2885d380857ee9f8c2e206ccd3cac219b..99cb9fe5e6800cd3c86ad24869b42890e4a189cc 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp
index be20c08f064c696e411c06001e4189cd55ae9b9a..61abe0ba4d282bf2681a916c150c494e658f3cff 100644 (file)
--- 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