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.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 9f5ff16320548039081e26b229b0c057a4026215..25ee2d82041ab92c0798fb164f15dfd5a0af29a4 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+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/

diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index eabf85e442bbb2fa88760b0f0dc7535a97f2ca42..998aadbdbbbaa16d2468c0094dfff0716f31812e 100644 (file)
--- 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 1363a000ca4b9c215eed55308d6b4a1811dd7094..ea30bec77a8ec6efc61a08da886362294a74f1f1 100644 (file)
--- 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)"