2002-12-23 David Carlton <carlton@math.stanford.edu>

	* gdb.base/selftest.exp (do_steps_and_nexts): Allow initial brace
	and current_directory initialization.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 23c9b10..1a0ca46 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-23  David Carlton  <carlton@math.stanford.edu>
+
+       * gdb.base/selftest.exp (do_steps_and_nexts): Allow initial brace
+       and current_directory initialization.
+
 2002-12-22  Jim Blandy  <jimb@redhat.com>
 
        * gdb.trace/tfind.exp: Pass '-O1' flag via the 'optimize' option,

diff --git a/gdb/testsuite/gdb.base/selftest.exp b/gdb/testsuite/gdb.base/selftest.exp
index 573b8aa..bf71c49 100644 (file)
--- a/gdb/testsuite/gdb.base/selftest.exp
+++ b/gdb/testsuite/gdb.base/selftest.exp
@@ -54,6 +54,10 @@ proc do_steps_and_nexts {} {
 
     for {set count 0} {$count < 26} {incr count} {
        send_gdb "list\n"
+       # NOTE: carlton/2002-12-11: The "initial brace" and
+       # "current_directory initialization" possibilities happen to
+       # me with GCC 3.1 on i686-pc-linux-gnu when I compile with
+       # optimization.
        gdb_expect {
            -re ".*context = data.*$gdb_prompt $" {
                set description "step over context initialization"
@@ -158,6 +162,14 @@ proc do_steps_and_nexts {} {
                set description "next over textdomain PACKAGE"
                set command "next"
            }
+           -re "\[0-9\]*\t\{\r\n$gdb_prompt $" {
+               set description "step over initial brace"
+               set command "step"
+           }
+           -re ".*current_directory = gdb_dirbuf.*$gdb_prompt $" {
+               set description "step over current_directory initialization"
+               set command "step"
+           }
            -re "\[ \t\]+\{\r\n$gdb_prompt $" {
                setup_xfail "mips-*-irix5*"
                fail "$description ended up at odd location"