From 7594f6236073fcc8696c43e1f5267e61f7d5c226 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 13 Oct 2017 13:38:24 +0100 Subject: [PATCH] Fix gdb.base/term.exp on non-"target native" boards With --target_board=native-extended-gdbserver, we get: Running .../src/gdb/testsuite/gdb.base/term.exp ... FAIL: gdb.base/term.exp: info terminal at breakpoint (gdb) info terminal No saved terminal information. Fix it by running the test everywhere, and expecting different output on non-native targets. gdb/testsuite/ChangeLog: 2017-10-13 Pedro Alves * gdb.base/term.exp: Don't skip if is_remote target. Instead, expect different "info terminal" output if testing with a non-native target. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/term.exp | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8a91202..73389ae 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,4 +1,10 @@ 2017-10-13 Pedro Alves + + * gdb.base/term.exp: Don't skip if is_remote target. Instead, + expect different "info terminal" output if testing with a + non-native target. + +2017-10-13 Pedro Alves Simon Marchi PR python/12966 diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp index c922deb..2c38816 100644 --- a/gdb/testsuite/gdb.base/term.exp +++ b/gdb/testsuite/gdb.base/term.exp @@ -13,11 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Don't try this for remote targets. -if [is_remote target] then { - continue -} - if { [prepare_for_testing "failed to prepare" term term.c] } { return -1 } @@ -33,9 +28,16 @@ if ![runto_main] then { } # Once while the program is running and stopped. -gdb_test "info terminal" \ - "Inferior's terminal status .currently saved by GDB.:.*" \ - "info terminal at breakpoint" + +# While only native targets save terminal status, we still test +# everywhere to make sure that the command doesn't misbehave. +if {[target_info gdb_protocol] == ""} { + set term_re "Inferior's terminal status .currently saved by GDB.:.*" +} else { + set term_re "No saved terminal information\\." +} + +gdb_test "info terminal" $term_re "info terminal at breakpoint" gdb_continue_to_end -- 2.7.4