diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2006-09-15 16:06:58 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2006-09-15 16:06:58 +0000 |
| commit | f02244589af6b288fca0ec30c22727e672c4f374 (patch) | |
| tree | 109b4abdc9265811e4f77fa8d37547cefdce8111 | |
| parent | b1d5316390a19c62c3e68fffafd20de61ca9fef8 (diff) | |
| download | gdb-f02244589af6b288fca0ec30c22727e672c4f374.tar.gz | |
gdb/testsuite/
* gdb.base/commands.exp (bp_deleted_in_command_test)
(temporary_breakpoint_commands): Allow run.c without a pathname.
* gdb.base/ending-run.exp: Allow E32Main.
| -rw-r--r-- | ChangeLog.csl | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/commands.exp | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/ending-run.exp | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 9f5ff163205..25ee2d82041 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,6 +1,13 @@ 2006-09-15 Daniel Jacobowitz <dan@codesourcery.com> gdb/testsuite/ + * gdb.base/commands.exp (bp_deleted_in_command_test) + (temporary_breakpoint_commands): Allow run.c without a pathname. + * gdb.base/ending-run.exp: Allow E32Main. + +2006-09-15 Daniel Jacobowitz <dan@codesourcery.com> + + gdb/testsuite/ * config/symbian.exp (infer_host_exec): Cope with MI. (mi_target_gdb_load): New. * lib/mi-support.exp: Use mi_target_gdb_load. diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index eabf85e442b..998aadbdbbb 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -454,7 +454,7 @@ proc bp_deleted_in_command_test {} { # Create a breakpoint, and associate a command-list to it, with # one command that deletes this breakpoint. gdb_test "break factorial" \ - "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \ + "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\." \ "breakpoint in bp_deleted_in_command_test" send_gdb "commands\n" @@ -495,7 +495,7 @@ proc bp_deleted_in_command_test {} { gdb_run_cmd gdb_expect { - -re ".*factorial command-list executed.*1.*$gdb_prompt $" { + -re ".*factorial command-list executed.*$gdb_prompt $" { pass "run factorial until breakpoint" } -re ".*$gdb_prompt $" { @@ -521,7 +521,7 @@ proc temporary_breakpoint_commands {} { # This test will verify that this commands list is executed when the # breakpoint is hit. gdb_test "tbreak factorial" \ - "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \ + "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\." \ "breakpoint in temporary_breakpoint_commands" send_gdb "commands\n" @@ -557,7 +557,7 @@ proc temporary_breakpoint_commands {} { gdb_run_cmd gdb_expect { - -re ".*factorial tbreak commands executed.*1.*$gdb_prompt $" { + -re ".*factorial tbreak commands executed.*$gdb_prompt $" { pass "run factorial until temporary breakpoint" } timeout { fail "(timeout) run factorial until temporary breakpoint" } diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp index 1363a000ca4..ea30bec77a8 100644 --- a/gdb/testsuite/gdb.base/ending-run.exp +++ b/gdb/testsuite/gdb.base/ending-run.exp @@ -207,6 +207,10 @@ gdb_expect { # another `next' is necessary. gdb_test "next" ".*in start_l ().*" "step out of main (on sh)" } + -re "E32Main (.*).*$gdb_prompt $" { + # On SymbianOS there's a different function which calls main. + pass "step out of main (on SymbianOS)" + } -re ".*$gdb_prompt $" { fail "step out of main (at end 2)" } timeout { fail "step out of main (hang or timeout on step at end 2)" |