From 0d30a335a6747bb0e2847e0aee2ba958cf19dac7 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 29 Jul 2015 11:09:43 +0100 Subject: Make gdb.base/varargs.exp use gdb_test_stdio gdb/testsuite/ChangeLog: 2015-07-29 Pedro Alves * gdb.base/varargs.exp: Use gdb_test_stdio. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/varargs.exp | 25 +++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5c52514..87f6759 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2015-07-29 Pedro Alves + * gdb.base/varargs.exp: Use gdb_test_stdio. + +2015-07-29 Pedro Alves + * gdb.base/shlib-call.exp: Use gdb_test_stdio. 2015-07-29 Pedro Alves diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp index 0e895c1..96933bb 100644 --- a/gdb/testsuite/gdb.base/varargs.exp +++ b/gdb/testsuite/gdb.base/varargs.exp @@ -84,25 +84,30 @@ if { $hp_aCC_compiler } { gdb_test_no_output "set overload-resolution 0" } -gdb_test "print find_max1(5,1,2,3,4,5)" \ - "find_max\\(5, 1, 2, 3, 4, 5\\) returns 5\[ \r\n\]+.\[0-9\]+ = 5" \ +gdb_test_stdio "print find_max1(5,1,2,3,4,5)" \ + "find_max\\(5, 1, 2, 3, 4, 5\\) returns 5\[ \r\n\]+" \ + ".\[0-9\]+ = 5" \ "print find_max1(5,1,2,3,4,5)" -gdb_test "print find_max1(1,3)" \ - ".*find_max\\(1, 3\\) returns 3\[ \r\n\]+.\[0-9\]+ = 3" \ +gdb_test_stdio "print find_max1(1,3)" \ + "find_max\\(1, 3\\) returns 3\[ \r\n\]+" \ + ".\[0-9\]+ = 3" \ "print find_max1(1,3)" -gdb_test "print find_max1(10,1,2,3,4,5,6,7,8,29,0)" \ - ".*find_max\\(10, 1, 2, 3, 4, 5, 6, 7, 8, 29, 0\\) returns 29\[ \r\n\]+.\[0-9\]+ = 29" \ +gdb_test_stdio "print find_max1(10,1,2,3,4,5,6,7,8,29,0)" \ + "find_max\\(10, 1, 2, 3, 4, 5, 6, 7, 8, 29, 0\\) returns 29\[ \r\n\]+" \ + ".\[0-9\]+ = 29" \ "print find_max1(10,1,2,3,4,5,6,7,8,29,0)" -gdb_test "print find_max2(3,1,2,3)" \ - ".*find_max\\(3, 1, 2, 3\\) returns 3\[ \r\n\]+.\[0-9\]+ = 3" \ +gdb_test_stdio "print find_max2(3,1,2,3)" \ + "find_max\\(3, 1, 2, 3\\) returns 3\[ \r\n\]+" \ + ".\[0-9\]+ = 3" \ "print find_max2(3,1,2,3)" if {![target_info exists gdb,skip_float_tests]} { - gdb_test "print find_max_double(5,1.0,17.0,2.0,3.0,4.0)" \ - ".*find_max\\(.*\\) returns 17\\.000000\[ \r\n\]+.\[0-9\]+ = 17" \ + gdb_test_stdio "print find_max_double(5,1.0,17.0,2.0,3.0,4.0)" \ + "find_max\\(.*\\) returns 17\\.000000\[ \r\n\]+" \ + ".\[0-9\]+ = 17" \ "print find_max_double(5,1.0,17.0,2.0,3.0,4.0)" } -- cgit v1.1