diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f4211d1..afaa9de 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,6 +1,9 @@ 2010-03-12 Daniel Jacobowitz <dan@codesourcery.com> - gdb/testsuite/ + * lib/gdb.exp (gdb_test_multiple): Handle -timeout. + +2010-03-12 Daniel Jacobowitz <dan@codesourcery.com> + * lib/gdb.exp (skip_stl_tests): New. (gdb_compile): Symbian needs -ldl. (shlib_target_file): New. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 01ebc52..6ed661e 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -601,12 +601,23 @@ proc gdb_test_multiple { command message user_code } { set processed_code "" set patterns "" set expecting_action 0 + set expecting_arg 0 foreach item $user_code subst_item $subst_code { if { $item == "-n" || $item == "-notransfer" || $item == "-nocase" } { lappend processed_code $item continue } - if {$item == "-indices" || $item == "-re" || $item == "-ex"} { + if { $item == "-indices" || $item == "-re" || $item == "-ex" } { + lappend processed_code $item + continue + } + if { $item == "-timeout" } { + set expecting_arg 1 + lappend processed_code $item + continue + } + if { $expecting_arg } { + set expecting_arg 0 lappend processed_code $item continue } |