import gdb-1999-06-07 snapshot

5 files changed, 14 insertions, 7 deletions

diff --git a/gdb/testsuite/gdb.base/Makefile.in b/gdb/testsuite/gdb.base/Makefile.in
index 11cf1da..050ccc8 100644
--- a/gdb/testsuite/gdb.base/Makefile.in
+++ b/gdb/testsuite/gdb.base/Makefile.in
@@ -1,7 +1,7 @@
 VPATH = @srcdir@
 srcdir = @srcdir@
 
-EXECUTABLES = all-types bitfields break \
+EXECUTABLES = all-types annota1 annota2 bitfields break \
 	call-ar-st call-rt-st call-strs callfuncs callfuncs2 commands \
 	compiler condbreak constvars coremaker display \
 	ending-run exprs funcargs int-type interrupt \
@@ -10,7 +10,7 @@ EXECUTABLES = all-types bitfields break \
 	mips_pro miscexprs nodebug opaque pointers pointers2 printcmds ptype \
 	recurse reread reread1 restore return run \
 	scope section_command setshow setvar \
-	shmain sigall signals smoke \
+	shmain sigall signals smoke smoke1 \
 	solib so-impl-ld so-indr-cl \
 	step-test structs structs2 twice-tmp varargs watchpoint whatis
 
diff --git a/gdb/testsuite/gdb.base/a1-selftest.exp b/gdb/testsuite/gdb.base/a1-selftest.exp
index bc3893a..c0d17c8 100644
--- a/gdb/testsuite/gdb.base/a1-selftest.exp
+++ b/gdb/testsuite/gdb.base/a1-selftest.exp
@@ -74,6 +74,10 @@ proc do_steps_and_nexts {} {
 		set description "step over ttyarg initialization"
 		set command "step"
 	    }
+	    -re ".*interparg = NULL.*$gdb_prompt $" {
+		set description "step over interparg initialization"
+		set command "step"
+	    }
 	    -re ".*time_at_startup = get_run_time.*$gdb_prompt $" {
 		set description "next over get_run_time and everything it calls"
 		set command "next"
@@ -269,7 +273,7 @@ proc test_with_self { executable } {
     # If we don't actually enter the xmalloc call when we give a
     # step command that seems like a genuine bug.  It seems to happen
     # on most RISC processors.
-    setup_xfail "alpha-*-*" "hppa*-*-*" "mips-*-*"
+    setup_xfail "alpha-*-*" "mips-*-*"
     set description "step into xmalloc call"
     send_gdb "step\n"
     gdb_expect {
diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
index cf9deba..281616b 100644
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ b/gdb/testsuite/gdb.base/condbreak.exp
@@ -122,7 +122,7 @@ gdb_test "info break" \
 #
 
 
-gdb_run_cmd
+rerun_to_main
 
 #
 # run until the breakpoint at a line number
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index da78e3b..a8d0f05 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -151,9 +151,12 @@ gdb_expect {
     -re ".*in.*start.*$gdb_prompt $" { 
         pass "step out of main"
     }
-  -re ".*Program received signal SIGTRAP.*$gdb_prompt $" {
+    -re ".*in.*currently asm.*$gdb_prompt $" { 
+        pass "step out of main into assembler"
+    }
+    -re ".*Program received signal SIGTRAP.*$gdb_prompt $" {
         pass "Cygmon stopped in ending trap."
-  }
+    }
     timeout { fail "hang or timeout on step at end 1" }
 }
 
diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp
index ea2461e..2b94de6 100644
--- a/gdb/testsuite/gdb.base/mips_pro.exp
+++ b/gdb/testsuite/gdb.base/mips_pro.exp
@@ -55,7 +55,7 @@ gdb_load ${binfile}
 if [runto middle] then {
     # PR 3016
     if {$gcc_compiled} then { 
-	setup_xfail "hppa*-*-*" "mips*-sgi-irix4*" "mips64*-*-elf"
+	setup_xfail "mips*-sgi-irix4*" "mips64*-*-elf"
     }
     gdb_test "backtrace" "#0.*middle.*#1.*top.*#2.*main.*"
 }