* gdb.base/help.exp: Update expected output.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 106832a2b1c32f08adf771504d0571b10f890c91..61062833b618d6d5179ba8bee2ef81248f2212be 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,6 @@
 2012-08-13  Doug Evans  <dje@google.com>
 
+       * gdb.base/help.exp: Update expected output.
        * gdb.base/default.exp: Update expected output of "show convenience".
 
 2012-08-10  Doug Evans  <dje@google.com>

diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp
index c9b9c883849dc4364e13a1ee8b544c67ee3d20c4..547495b2e3576d513f05edc9fcd9ac378aea8434 100644 (file)
--- a/gdb/testsuite/gdb.base/help.exp
+++ b/gdb/testsuite/gdb.base/help.exp
@@ -506,7 +506,7 @@ gdb_test "help show complaints" "Show max number of complaints about incorrect s
 # test help show confirm
 gdb_test "help show confirm" "Show whether to confirm potentially dangerous operations\." "help show confirm"
 # test help show convenience
-gdb_test "help show convenience" "Debugger convenience \\(\"\\\$foo\"\\) variables\.\[\r\n\]+These variables are created when you assign them values;\[\r\n\]+thus, \"print \\\$foo=1\" gives \"\\\$foo\" the value 1\.  Values may be any type\.\[\r\n\]+A few convenience variables are given values automatically:\[\r\n\]+\"\\\$_\"holds the last address examined with \"x\" or \"info lines\",\[\r\n\]+\"\\\$__\" holds the contents of the last address examined with \"x\"\." "help show convenience"
+gdb_test "help show convenience" "Debugger convenience \\(\"\\\$foo\"\\) variables and functions\.\[\r\n\]+Convenience variables are created when you assign them values;\[\r\n\]+thus, \"set \\\$foo=1\" gives \"\\\$foo\" the value 1\.  Values may be any type\.\[\r\n\]+A few convenience variables are given values automatically:\[\r\n\]+\"\\\$_\"holds the last address examined with \"x\" or \"info lines\",\[\r\n\]+\"\\\$__\" holds the contents of the last address examined with \"x\"\.\[\r\n\]+Convenience functions are defined via the Python API\." "help show convenience"
 # test help show directories
 gdb_test "help show directories" "Show the search path for finding source files\.\[\r\n\]+\\\$cwd in the path means the current working directory\.\[\r\n\]+\\\$cdir in the path means the compilation directory of the source file\..*" "help show directories"
 # test help show editing