* gdb.arch/alpha-step.exp (test_stepi): Do not include trailing

spaces/tabs in regular expressions since they might not be there.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 48a49e163a1ce492ac75478752f7cb48c9c3a974..7e239a72b62d019f12fdad88248c2777b3c9317d 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-08  Mark Kettenis  <kettenis@gnu.org>
+
+       * 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  <andrew.stubbs@st.com>
 
        * 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 40dcb0bfb961e4be5c773181f152144a8b34669b..735cee395abecce40c37595a89e7de1298900e20 100644 (file)
--- 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"
 
 }