From 23fb630af09f2601e7cb75233837399d67cfd017 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 13 Oct 2017 10:48:42 +0100 Subject: [PATCH] Fix is_remote check in gdb.base/remote.exp 1. Otherwise, when the native-gdbserver board stops setting is_remote, this test would stop running there. 2. Makes the test run with --target_board=native-extended-gdbserver too. gdb/testsuite/ChangeLog: 2017-10-13 Pedro Alves * gdb.base/remote.exp: Check gdb_protocol instead of is_remote. (top level): Add comment. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/remote.exp | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 51d788b19fb..117ab9bb53e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-13 Pedro Alves + + * gdb.base/remote.exp: Check gdb_protocol instead of is_remote. + (top level): Add comment. + 2017-10-13 Pedro Alves * gdb.base/remote.exp (top level): Fix comment typo and add diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp index db6fc006091..2f3ede17fc6 100644 --- a/gdb/testsuite/gdb.base/remote.exp +++ b/gdb/testsuite/gdb.base/remote.exp @@ -13,10 +13,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . - - -# test only on a remote target board -if {! [is_remote target]} { +# Test only on boards that actually use the remote protocol. +if {[target_info gdb_protocol] != "remote" + && [target_info gdb_protocol] != "extended-remote"} { return } @@ -103,6 +102,10 @@ proc gdb_load_timed {executable class writesize} { pass $test } +# These download tests won't actually download anything on !is_remote +# target boards, but we run them anyway because it's simpler, and +# harmless. + # Typically about 400-1 bytes can be downloaded gdb_load_timed $binfile "limit" 398 gdb_load_timed $binfile "limit" 400 -- 2.30.2