* gdb.base/break.exp (test_next_with_recursion): Accept any line

	number (we are already testing that the correct source line text
	gets printed).

	* gdb.base/break.exp: Make one test if $usestubs.  I'm not sure
	that is what is intended, but something needed to be done to get
	sunos4 native working again.

	* gdb.c++/misc.cc (main): Fix typo (#iffef -> #ifdef).

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e1849e88c8ba81437e0c75c203351a73e26868a2..0e5f8455f553886a79d936f55a2b2f46d6816adc 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,15 @@
 Fri Mar 24 06:11:05 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * gdb.base/break.exp (test_next_with_recursion): Accept any line
+       number (we are already testing that the correct source line text
+       gets printed).
+
+       * gdb.base/break.exp: Make one test if $usestubs.  I'm not sure
+       that is what is intended, but something needed to be done to get
+       sunos4 native working again.
+
+       * gdb.c++/misc.cc (main): Fix typo (#iffef -> #ifdef).
+
        * gdb.base/a1-selftest.exp (test_with_self): Remove comment which
        apparently went with a (very) old xfail.
 

diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index f2f56fb87bd609b2401c2f511f0a3b0288aacbe8..5fb51fb7a8647ede4eae8cd6fd0b24438e9f4039 100644 (file)
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -143,8 +143,10 @@ if !$usestubs then {
   }
 }
 
-gdb_test $cmd "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:56.*56\[\t \]+if .argc.*" \
+if $usestubs {
+    gdb_test $cmd "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:56.*56\[\t \]+if .argc.*" \
        "run until function breakpoint"
+}
 
 #
 # run until the breakpoint at a line number
@@ -321,7 +323,8 @@ proc test_next_with_recursion {} {
 
     delete_breakpoints
 
-    gdb_test next "75\[\t \]+return \\(value\\);.*" "next over recursive call"
+    gdb_test next "\[0-9\]*\[\t \]+return \\(value\\);.*" \
+       "next over recursive call"
 
     # OK, we should be back in the same stack frame we started from.
     # Do a backtrace just to confirm.