From 7cb000a97ebcf7f23fe1b63fbbdd86d87b8c8634 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 29 Jul 2015 11:09:42 +0100 Subject: [PATCH] Make gdb.base/ending-run.exp use gdb_test_stdio gdb/testsuite/ChangeLog: 2015-07-29 Pedro Alves * gdb.base/ending-run.exp: Use gdb_test_stdio. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/ending-run.exp | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b7274f8..ce04e39 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2015-07-29 Pedro Alves + * gdb.base/ending-run.exp: Use gdb_test_stdio. + +2015-07-29 Pedro Alves + * gdb.base/call-rt-st.exp (print_struct_call): Split "result" parameter into two new parameters, "inf_result" and "gdb_result". Expect inferior output and gdb output from $inferior_spawn_id and diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp index 7d37a48..dceebcd 100644 --- a/gdb/testsuite/gdb.base/ending-run.exp +++ b/gdb/testsuite/gdb.base/ending-run.exp @@ -99,14 +99,18 @@ gdb_test_multiple "i b" "all set to continue" { # is output from the program. # if ![gdb_skip_stdio_test "cont"] { - gdb_test "cont" ".*1 2 7 14 23 34 47 62 79.*Breakpoint.*$break2_line.*" + gdb_test_stdio "cont" \ + "1 2 7 14 23 34 47 62 79" \ + "Breakpoint.*$break2_line.*" } else { gdb_test "cont" ".*Breakpoint.*$break2_line.*" } if ![gdb_skip_stdio_test "Step to return"] { - gdb_test "next" ".*Goodbye!.*[expr {$break2_line + 1}].*" \ - "Step to return" + gdb_test_stdio "next" \ + "Goodbye!" \ + "[expr {$break2_line + 1}].*" \ + "Step to return" } else { gdb_test "next" ".*" "" } -- 2.7.4