From 39413b296f9eb92ae3936bf29397ac1d35ca803b Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 29 Jul 2015 11:09:42 +0100 Subject: [PATCH] Make gdb.base/shlib-call.exp use gdb_test_stdio gdb/testsuite/ChangeLog: 2015-07-29 Pedro Alves * gdb.base/shlib-call.exp: Use gdb_test_stdio. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/shlib-call.exp | 20 ++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ce04e398c3f..5c525148e16 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-07-29 Pedro Alves + + * gdb.base/shlib-call.exp: Use gdb_test_stdio. + 2015-07-29 Pedro Alves * gdb.base/ending-run.exp: Use gdb_test_stdio. diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp index b79165a29d7..2ccaa39ded9 100644 --- a/gdb/testsuite/gdb.base/shlib-call.exp +++ b/gdb/testsuite/gdb.base/shlib-call.exp @@ -79,8 +79,9 @@ gdb_test "print g" "\[0-9\]* = 1" "print g" #step -over if ![gdb_skip_stdio_test "next over shr1"] { - gdb_test "next" \ - "address of sgs is $hex.*g = shr2\\(g\\);" \ + gdb_test_stdio "next" \ + "address of sgs is $hex" \ + "g = shr2\\(g\\);" \ "next over shr1" } else { gdb_test "next" ".*" "" @@ -92,15 +93,17 @@ gdb_test "print g" "\[0-9\]* = 2" "print g" #print shr1(1) if ![gdb_skip_stdio_test "print shr1(1)"] { - gdb_test "print shr1(1)" \ - "address of sgs is $hex.*\[0-9\]* = 2" \ + gdb_test_stdio "print shr1(1)" \ + "address of sgs is $hex" \ + "\[0-9\]* = 2" \ "print shr1(1)" } #print shr1(g) if ![gdb_skip_stdio_test "print shr1(g)"] { - gdb_test "print shr1(g)" \ - "address of sgs is $hex.*\[0-9\]* = 4" \ + gdb_test_stdio "print shr1(g)" \ + "address of sgs is $hex" \ + "\[0-9\]* = 4" \ "print shr1(g)" } @@ -117,8 +120,9 @@ gdb_test "continue" \ #print shr1(1) if ![gdb_skip_stdio_test "print shr1(1) 2nd time"] { - gdb_test "print shr1(1)" \ - "address of sgs is $hex.*\[0-9\]* = 2" \ + gdb_test_stdio "print shr1(1)" \ + "address of sgs is $hex" \ + "\[0-9\]* = 2" \ "print shr1(1) 2nd time" } -- 2.39.2