From 02eba61aa6cad683e96cf13f483adc04982c0c2b Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 14 May 2020 17:24:49 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.fortran/nested-funcs-2.exp with gdbserver When running test-case gdb.fortran/nested-funcs-2.exp with target board native-gdbserver, we have: ... (gdb) call contains_keyword::subroutine_to_call()^M (gdb) FAIL: gdb.fortran/nested-funcs-2.exp: src_prefix=0: nest_prefix=1: \ call contains_keyword::subroutine_to_call() ... This is caused by the fact that we're trying to match inferior output using gdb_test. Fix this by using gdb_test_stdio instead. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-05-14 Tom de Vries * gdb.fortran/nested-funcs-2.exp: Use gdb_test_stdio to test inferior output. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.fortran/nested-funcs-2.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5f1b04f6c3..6c025832e3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-05-14 Tom de Vries + + * gdb.fortran/nested-funcs-2.exp: Use gdb_test_stdio to test inferior + output. + 2020-05-14 Tom de Vries * gdb.base/align.exp: Split into ... diff --git a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp index 724be74ff8..4e517bba2f 100644 --- a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp +++ b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp @@ -89,7 +89,7 @@ proc do_bp_tests {with_src_prefix_p with_nest_prefix_p} { # Call a contained function. if { ${with_nest_prefix_p} } { - gdb_test "call ${nest_prefix}subroutine_to_call()" " called" + gdb_test_stdio "call ${nest_prefix}subroutine_to_call()" " called" "" } # Break on another contained function and run to it.