* lib/gdb.exp (default_gdb_version): A version number must start

	with a digit, but other than that contains all characters up to
	the first whitespace character.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f27584cad8d8574f1f0b2d0462bb35bc31fcebc8..59e7f048c4d9e409ed37cb5f96ec666cc9763d67 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 27 08:00:34 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * lib/gdb.exp (default_gdb_version): A version number must start
+       with a digit, but other than that contains all characters up to
+       the first whitespace character.
+
 Sun Mar 26 13:19:32 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
        * gdb.base/commands.exp (breakpoint_command_test): New tests.

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index e91db0eeaa3d1d41dd248207e3efd010510bd367..cec1f2765ca0255e5a55fd1fab2799c389beb24b 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -63,7 +63,7 @@ proc default_gdb_version {} {
     global GDBFLAGS
     if {[which $GDB] != 0} then {
        set tmp [exec echo "q" | $GDB -nw $GDBFLAGS]
-       regexp " \[0-9.\]+" $tmp version
+       regexp " \[0-9\]\[^ \t\n\]+" $tmp version
        clone_output "[which $GDB] version$version -nw $GDBFLAGS \n"
     } else {
        warning "$GDB does not exist"