* gdb.base/a1-selftest.exp: Tweak tests to account for new

	format for printing version.
	* gdb.base/default.exp: Ditto.
	* gdb.base/interrupt.exp: Fix problem with cascade of
	errors if child process dies while calling a function.

diff --git a/gdb/testsuite/gdb.base/a1-selftest.exp b/gdb/testsuite/gdb.base/a1-selftest.exp
index 5699ad8d8b2b0368bab165d178a41398a892d056..5a784f2335a78f5c432f0f12cfd067c4ace9076d 100644 (file)
--- a/gdb/testsuite/gdb.base/a1-selftest.exp
+++ b/gdb/testsuite/gdb.base/a1-selftest.exp
@@ -298,11 +298,19 @@ proc test_with_self {} {
     # start the "xgdb" process
     send "continue\n"
     expect {
+       -re "GNU gdb \[0-9\.\]*.*
+Copyright \[0-9\]* Free Software Foundation, Inc.*
+GDB is free software, covered by the GNU General Public License, and you are.*
+welcome to change it and/or distribute copies of it under certain conditions.*
+Type \"show copying\" to see the conditions.*
+There is absolutely no warranty for GDB.  Type \"show warranty\" for details.*
+This GDB was configured as .*$prompt $"\
+           { pass "xgdb is at prompt" }
        -re "GDB is free software and you are welcome to distribute copies of it.*
  under certain conditions; type \"show copying\" to see the conditions..*
 There is absolutely no warranty for GDB; type \"show warranty\" for details..*
 GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$prompt $"\
-           { pass "xgdb is at prompt" }
+           { pass "xgdb is at prompt (obsolescent gdb)" }
        -re ".*$prompt $"       { fail "xgdb is at prompt" }
        timeout             { fail "(timeout) xgdb is at prompt" }
     }