diff options
| author | Marek Polacek <mpolacek@sourceware.org> | 2011-09-30 15:07:33 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@sourceware.org> | 2011-09-30 15:07:33 +0000 |
| commit | c5cb204fbbdc0207d7aa1dd9b7fc5ba807fc3d58 (patch) | |
| tree | 7acc48a59068fb8e228611254e68bd94f0a6cfae | |
| parent | fc28f9aa231c8f3386e1c9bdb448d9cdd9cae1a9 (diff) | |
| download | gdb-c5cb204fbbdc0207d7aa1dd9b7fc5ba807fc3d58.zip gdb-c5cb204fbbdc0207d7aa1dd9b7fc5ba807fc3d58.tar.gz gdb-c5cb204fbbdc0207d7aa1dd9b7fc5ba807fc3d58.tar.bz2 | |
gdb.python/python.exp: fix up race
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/python.exp | 16 |
2 files changed, 19 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6361dba..b5b40ef 100644 --- 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 4da3c88..ee39dba 100644 --- 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 } } |