gdb.python/python.exp: fix up race

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6361dba62490f2c106c82d6329b8909681c07deb..b5b40ef0a056702e77e2cf6c78ebf2a997e7b9c6 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-30  Marek Polacek  <mpolacek@redhat.com>
+
+       * gdb.python/python.exp (verify pagination beforehand)
+       (verify pagination afterwards): Fix race by splitting the line.
+
 2011-09-29  Joseph Myers  <joseph@codesourcery.com>
 
        * lib/gdb.exp (is_amd64_regs_target, is_x86_like_target): Allow

diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 4da3c88870451346dd63e04cd289b027f176b4f3..ee39dbad51834bd1c40e92b269ac2bdccc7b253f 100644 (file)
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -106,7 +106,13 @@ gdb_test_no_output "set height $lines"
 
 set test "verify pagination beforehand"
 gdb_test_multiple "python print \"\\n\" * $lines" $test {
-    -re "---Type <return> to continue, or q <return> to quit---$" {
+    -re "---Type <return>" {
+       exp_continue
+    }
+    -re " to continue, or q <return>" {
+       exp_continue
+    }
+    -re " to quit---$" {
        pass $test
     }
 }
@@ -116,7 +122,13 @@ gdb_test "python if gdb.execute('python print \"\\\\n\" * $lines', to_string=Tru
 
 set test "verify pagination afterwards"
 gdb_test_multiple "python print \"\\n\" * $lines" $test {
-    -re "---Type <return> to continue, or q <return> to quit---$" {
+    -re "---Type <return>" {
+       exp_continue
+    }
+    -re " to continue, or q <return>" {
+       exp_continue
+    }
+    -re " to quit---$" {
        pass $test
     }
 }