From c8f021f82465520f2f8c331abac49f34dd265229 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 3 Sep 2007 14:58:47 +0000 Subject: [PATCH] * gdb.base/default.exp (show version): Update the version text. * gdb.gdb/selftest.exp (xgdb is at prompt): Likewise. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/default.exp | 2 +- gdb/testsuite/gdb.gdb/selftest.exp | 12 ++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index da58f98..05a3393 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-09-03 Jan Kratochvil + + * gdb.base/default.exp (show version): Update the version text. + * gdb.gdb/selftest.exp (xgdb is at prompt): Likewise. + 2007-09-02 Jan Kratochvil * gdb.base/gcore-buffer-overflow.c, gdb.base/gcore-buffer-overflow.exp: diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index 295885c..67afbf8 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -665,7 +665,7 @@ gdb_test "show values" "" "show values" #test show verbose gdb_test "show verbose" "Verbose printing of informational messages is o.*|Verbosity is off.*" "show verbose" #test show version -gdb_test "show version" "GNU gdb \[0-9\.\]*(\[^\r\n\]*\[\r\n\])+Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc(\[^\r\n\]*\[\r\n\])+GDB is free software, covered by the GNU General Public License, and you are(\[^\r\n\]*\[\r\n\])+welcome to change it and/or distribute copies of it under certain conditions(\[^\r\n\]*\[\r\n\])+Type \"show copying\" to see the conditions(\[^\r\n\]*\[\r\n\])+There is absolutely no warranty for GDB. Type \"show warranty\" for details(\[^\r\n\]*\[\r\n\])+This GDB was configured as .*|GDB is free software and you are welcome to distribute copies of it(\[^\r\n\]*\[\r\n\])+ under certain conditions; type \"show copying\" to see the conditions.(\[^\r\n\]*\[\r\n\])+There is absolutely no warranty for GDB; type \"show warranty\" for details.(\[^\r\n\]*\[\r\n\])+GDB.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*" "show version" +gdb_test "show version" "GNU gdb \[0-9\.\]*(\[^\r\n\]*\[\r\n\])+Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc(\[^\r\n\]*\[\r\n\])+License GPLv3\\+: GNU GPL version 3 or later (\[^\r\n\]*\[\r\n\])+This is free software: you are free to change and redistribute it.(\[^\r\n\]*\[\r\n\])+There is NO WARRANTY, to the extent permitted by law. Type \"show copying\"(\[^\r\n\]*\[\r\n\])+and \"show warranty\" for details..*" "show version" #test show width gdb_test "show width" "Number of characters gdb thinks are in a line is.*" "show width" #test show write diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp index a56194b..520c523 100644 --- a/gdb/testsuite/gdb.gdb/selftest.exp +++ b/gdb/testsuite/gdb.gdb/selftest.exp @@ -411,17 +411,25 @@ proc test_with_self { executable } { gdb_expect { -re "GNU gdb \[0-9\.\]*.* Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.* +License GPLv3\\+: GNU GPL version 3 or later .* +This is free software: you are free to change and redistribute it.* +There is NO WARRANTY, to the extent permitted by law. Type \"show copying\".* +and \"show warranty\" for details.* +This GDB was configured as .*$gdb_prompt $"\ + { pass "xgdb is at prompt" } + -re "GNU gdb \[0-9\.\]*.* +Copyright \\(C\\) \[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 .*$gdb_prompt $"\ - { pass "xgdb is at prompt" } + { pass "xgdb is at prompt (obsolescent gdb 2)" } -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..*$gdb_prompt $"\ - { pass "xgdb is at prompt (obsolescent gdb)" } + { pass "xgdb is at prompt (obsolescent gdb 1)" } -re ".*$gdb_prompt $" { fail "xgdb is at prompt" } timeout { fail "(timeout) xgdb is at prompt" } } -- 2.7.4