* gdb.cp/cplusfuncs.exp (info_func_regexp, print_addr): Don't

	assume new `regsub' syntax available.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6bdf95a..5caae10 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-21  Pedro Alves  <pedro@codesourcery.com>
+
+       * gdb.cp/cplusfuncs.exp (info_func_regexp, print_addr): Don't
+       assume new `regsub' syntax available.
+
 2009-11-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * gdb.base/watchpoint-hw-hit-once.exp,

diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
index 607dceb..092c0ff 100644 (file)
--- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
+++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
@@ -241,7 +241,7 @@ proc info_func_regexp { name demangled } {
     global gdb_prompt
 
     send_gdb "info function $name\n"
-    set demangled [regsub {\\\(void\\\)} $demangled {\(\)}]
+    regsub {\\\(void\\\)} $demangled {\(\)} demangled
     gdb_expect {
        -re ".*File .*:\r\n(class |)$demangled\r\n.*$gdb_prompt $" {
            pass "info function for \"$name\""
@@ -328,7 +328,7 @@ proc print_addr_2_kfail { name good bad bugid } {
 #
 
 proc print_addr { name } {
-    set expected [regsub {\(void\)} $name {()}]
+    regsub {\(void\)} $name {()} expected
     if {[string first "::" $name] == -1} {
        # C function -- must be qutoed
        set name "'$name'"