From 68777c298919d6dbdb9537c92a64ed9440ef6f3c Mon Sep 17 00:00:00 2001 From: Markus Metzger Date: Thu, 26 Jan 2017 15:07:44 +0100 Subject: [PATCH] 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. --- 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 3e0a5da2885..99cb9fe5e68 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-02-01 Markus Metzger + + * gdb.btrace/enable.exp: Call gdb_exit before + skip_gdbserver_tests. + 2017-02-01 Markus Metzger * 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 be20c08f064..61abe0ba4d2 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 -- 2.30.2