diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/static-print-quit.exp | 25 |
2 files changed, 27 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 180edc8..040b63a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2011-05-06 Jan Kratochvil <jan.kratochvil@redhat.com> + + Fix a race. + * gdb.cp/static-print-quit.exp (print c): Split to ... + (print c - <return>, print c - q <return>, print c - to quit): + ... these. Make the testfile untested on gdb-7.1. + 2011-5-05 Janis Johnson <janisjo@codesourcery.com> * lib/gdb.exp (exec_target_file, exec_symbol_file, diff --git a/gdb/testsuite/gdb.cp/static-print-quit.exp b/gdb/testsuite/gdb.cp/static-print-quit.exp index b6e34aa..38757df 100644 --- a/gdb/testsuite/gdb.cp/static-print-quit.exp +++ b/gdb/testsuite/gdb.cp/static-print-quit.exp @@ -30,14 +30,29 @@ clean_restart $executable gdb_test_no_output "set width 80" gdb_test_no_output "set height 2" -set test "print c" -gdb_test_multiple $test $test { - -re " = \{loooooooooooooooooooooooooooooooooooooooooooooong = 0, static field = \{\r\n---Type <return> to continue, or q <return> to quit---$" { +set test "print c - <return>" +gdb_test_multiple "print c" $test { + -re "\\$\[0-9\]+ = \{loooooooooooooooooooooooooooooooooooooooooooooong = 0, static field = \{\r\n---Type <return>" { pass $test } + -re "\r\n---Type <return>" { + # gdb-7.1 did not crash with this testcase but it had the same bug. + untested ${testfile}.exp + return 0 + } +} + +set test "print c - q <return>" +gdb_test_multiple "" $test { + -re " to continue, or q <return>" { + pass $test + } +} + +set test "print c - to quit" +gdb_test_multiple "" $test { -re " to quit---$" { - fail $test - return -1 + pass $test } } |