* gdb.base/a1-selftest.exp (do_steps_and_nexts): Reinitialize source

	directory to search gdb directory. Accept and step over conditional
	stack alignment code. Consume $prompt in failure cases.
	Reset timeout to $oldtimeout instead of some arbitrary value.
	* gdb.base/nodebug.exp:  Limit backtrace to 10 frames to avoid
	timeout problems with infinite stack backtraces.
	* gdb.base/ptype.exp (ptype struct link, union tu_link):
	Accept function parameters for linkfunc member.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d93bd030cbff9eb9405e3ceac6bd454068042e01..94f51a2b5b1aec41385ec6777dab342e6dca6f51 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+Fri Nov 22 10:13:29 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+       * gdb.base/a1-selftest.exp (do_steps_and_nexts):  Reinitialize source
+       directory to search gdb directory. Accept and step over conditional
+       stack alignment code. Consume $prompt in failure cases.
+       Reset timeout to $oldtimeout instead of some arbitrary value.
+       * gdb.base/nodebug.exp:  Limit backtrace to 10 frames to avoid
+       timeout problems with infinite stack backtraces.
+       * gdb.base/ptype.exp (ptype struct link, union tu_link):
+       Accept function parameters for linkfunc member.
+
 Thu Nov 21 09:17:19 1996  Fred Fish  <fnf@cygnus.com>
 
        * lib/gdb.exp (CFLAGS): Remove, unreferenced.

diff --git a/gdb/testsuite/gdb.base/a1-selftest.exp b/gdb/testsuite/gdb.base/a1-selftest.exp
index 5a784f2335a78f5c432f0f12cfd067c4ace9076d..c70a92fe8d3f1ce4c11e6f462d723f499b6d5370 100644 (file)
--- a/gdb/testsuite/gdb.base/a1-selftest.exp
+++ b/gdb/testsuite/gdb.base/a1-selftest.exp
@@ -46,6 +46,9 @@ if [istarget "m68k*-*-hpux*"] then {
 
 proc do_steps_and_nexts {} {
     global prompt
+    global srcdir
+ 
+    gdb_reinitialize_dir $srcdir/..
 
     for {set count 0} {$count < 20} {incr count} {
        send "list\n"
@@ -86,6 +89,18 @@ proc do_steps_and_nexts {} {
                set description "next over init_malloc and everything it calls"
                set command "next"
            }
+           -re ".*count . 0x3.*$prompt $" {
+               set description "next over conditional stack alignment code 1"
+               set command "next"
+           }
+           -re ".*if .i != 0.*$prompt $" {
+               set description "next over conditional stack alignment code 2"
+               set command "next"
+           }
+           -re ".*alloca .i - 4.*$prompt $" {
+               set description "next over conditional stack alignment alloca"
+               set command "next"
+           }
            -re ".*SET_TOP_LEVEL.*$prompt $" {
                set description "next over SET_TOP_LEVEL call"
                set command "next"
@@ -113,11 +128,15 @@ proc do_steps_and_nexts {} {
                setup_xfail "mips-*-irix5*"
                fail "$description ended up at odd location"
            }
-           -re ".*main.c.*No such file or directory" {
+           -re ".*main.c.*No such file or directory.*$prompt $" {
                setup_xfail "rs6000-*-aix3*"
                fail "must be able to list source lines"
                return
            }
+           -re ".*$prompt $" {
+               fail "unknown source line after $description"
+               return
+           }
            default {
                fail "unknown source line near main"
                return
@@ -166,7 +185,7 @@ proc test_with_self {} {
        verbose "Timeout is now $timeout seconds" 2
        return -1
     }
-    set timeout 30
+    set timeout $oldtimeout
     verbose "Timeout is now $timeout seconds" 2
 
     # disassemble yourself
@@ -237,7 +256,7 @@ proc test_with_self {} {
        }
     }
 
-    set timeout 30
+    set timeout $oldtimeout
     verbose "Timeout is now $timeout seconds" 2
 
     # do we have a version number ?