From 1dff4b6426c6eadfbb431772fe4a6b22767b17fd Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Fri, 7 Jul 2006 23:10:42 +0000 Subject: [PATCH] * gdb.arch/alpha-step.exp (test_stepi): Do not include trailing spaces/tabs in regular expressions since they might not be there. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.arch/alpha-step.exp | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 48a49e1..7e239a7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-07-08 Mark Kettenis + + * gdb.arch/alpha-step.exp (test_stepi): Do not include trailing + spaces/tabs in regular expressions since they might not be there. + 2006-07-07 Andrew Stubbs * gdb.base/ifelse.exp: New file. diff --git a/gdb/testsuite/gdb.arch/alpha-step.exp b/gdb/testsuite/gdb.arch/alpha-step.exp index 40dcb0b..735cee3 100644 --- a/gdb/testsuite/gdb.arch/alpha-step.exp +++ b/gdb/testsuite/gdb.arch/alpha-step.exp @@ -63,7 +63,7 @@ proc test_stepi {function } { # Extra check to make sure we stopped on the FP branch instruction. gdb_test "x /i \$pc" \ - "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fb$function\[ \t\]+.*" \ + "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fb$function.*" \ "Check breakpoint on fb$function instruction (first call)" # Step test, followed by the check that we landed on the expected @@ -75,7 +75,7 @@ proc test_stepi {function } { "stepi on fb$function (first call)" gdb_test "x /i \$pc" \ - "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+ret\[ \t\]+.*" \ + "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+ret.*" \ "Check stepi over fb$function stopped on ret" # Continue again. FUNCTION should be called a second time, this time @@ -88,7 +88,7 @@ proc test_stepi {function } { # Extra check to make sure we stopped on the FP branch instruction. gdb_test "x /i \$pc" \ - "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fb$function\[ \t\]+.*" \ + "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fb$function.*" \ "Check breakpoint on fb$function instruction (second call)" # Step test, branch should not be taken. @@ -100,7 +100,7 @@ proc test_stepi {function } { # Extra check to verify that we landed on the instruction we expected. gdb_test "x /i \$pc" \ - "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fneg\[ \t\]+.*" \ + "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fneg.*" \ "Check stepi over fb$function stopped on fneg instruction" } -- 2.7.4