import gdb-19990422 snapshot

64 files changed, 1593 insertions, 1389 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 77a96b0..331c2af 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,10 +1,143 @@
+1999-04-20  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	* gdb.c++/demangle.exp (test_gnu_style_demangling): Add tests for
+	Marcus Daniel's and Dale Hawkins's demangler crashes.
+
+	* gdb.c++/demangle.exp (test_gnu_style_demangling,
+ 	test_lucid_style_demangling, test_arm_style_demangling,
+ 	test_hp_style_demangling): Try Tom Tromey's core-dumping
+ 	identifier under each demangling style.
+
+1999-04-07  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	* gdb.c++/demangle.exp: Include the current demangling style
+	in all test names.
+	(current_demangling_style): New global variable.
+	(set_demangling_style, test_demangling_core, test_demangling,
+	test_demangling_exact): New functions.
+	(test_gnu_style_demangling, test_lucid_style_demangling,
+	test_arm_style_demangling, test_hp_style_demangling): Use those,
+	instead of calling gdb_test and gdb_test_exact directly.
+	(catch_demangling_errors): New function, which reports errors
+	signalled by the demangling test functions in an orderly way.
+	(do_tests): Use catch_demangling_errors.
+
+1999-04-06  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	* gdb.base/signals.exp (test_handle_all_print): Use () for
+ 	grouping in expressions, not {}.
+
+	* gdb.base/smoke.exp: Test value of x, not y.  The latter isn't
+ 	initialized yet.
+
+1999-04-01  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* gdb.c++/derivation.exp: Pass ptype tests if synthesized methods
+	are listed.
+
+1999-03-26  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* gdb.stabs/weird.exp: Test for CC being defined before
+	looking at its value.
+
+1999-03-25  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* gdb.base/call-ar-st.exp: Remove stray '#'.
+	* gdb.base/miscexprs.exp: Allow "short" and "long" as well as
+	"short int" and "long int".
+	* gdb.c++/overload.cc: Cast the string added in the previous
+ 	change, to mollify finicky HP compiler.
+	* gdb.hp/reg-test.exp (testfile): Fix file name.
+	* gdb.stabs/weird.exp: Don't try to run if HP compiler in use.
+	
+	* gdb.c++/misc.cc (main): Initialize obj_with_enum.
+	* gdb.c++/classes.exp: Fix test of obj_with_enum values, allow
+	alternate form of enum ptype.
+
 1999-03-23  Stan Shebs  <shebs@andros.cygnus.com>
 
+	* lib/gdb.exp (skip_hp_tests): Remove gcc_used argument.
+	* gdb.hp/*.exp: Change all to run compiler probe only after
+ 	passing skip_hp_tests, so as not to waste time on guaranteed
+ 	failure.
+
 	* gdb.c++/overload.cc: Pass string instead of char addr, always
 	init ccpfoo.
 	* gdb.c++/templates.cc: Fix syntax error.
 
-1999-03-09  Jim Blandy  <jimb@zwingli.cygnus.com>
+Tue Mar 23 14:56:36 1999  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+	* gdb.base/commands.exp: Add test for correct position of '>'
+	when issuing the 'commands' command after a 'while' or 'if' 
+	command.
+
+1999-03-18  James Ingham  <jingham@cygnus.com>
+
+	* gdb.c++/ovldbreak.exp: Use gdb_continue_to_end
+
+	* gdb.c++/method.exp: It was testing an uninitialized int on the
+	stack and assuming it was positive.
+
+	* gdb.base/watchpoint.exp: Use gdb_continue_to_end.
+
+	* gdb.base/step-test.exp: Catch a case where finish is broken and
+	keep it from killing the rest of the tests. 
+	Use gdb_continue_to_end.
+
+	* gdb.base/sigall.exp: use gdb_continue_to_end.
+
+	* gdb.base/ena-dis-br.exp: use gdb_continue_to_end.
+
+	* gdb.base/display.exp: use runto_main, not run.
+
+	* gdb.base/default.exp: Check for the current error message in the 
+	r abbreviation test.  
+	Add strongarm to the targets that know info float.
+
+	* gdb.base/condbreak.exp: Use the gdb_run command rather than just 
+	run which doesn't work with monitors.
+
+	* gdb.base/call-ar-st.exp: fixed bogus regexp in continuing to 1034 test.
+
+	* gdb.base/break.exp: use the gdb_continue_to_end proc.
+
+	* lib/gdb.exp: I had added gdb_continue_to_end used to run to the end of a
+	program.  Traps the case (in Cygmon) when the program never really 
+	exits.  Same as Mark's continue_to_exit, but I had put it in a lot 
+	more places, so I used my name.  Sorry Mark...
+
+	* config/monitor.exp (gdb_target_monitor): added another
+	target_info parameter: remotebinarydownload.  This will set the
+	remotebinarydownload flag if this is causing some boards trouble.
+
+1999-03-18  Mark Salter  <msalter@cygnus.com>
+
+	* lib/gdb.exp (continue_to_exit): New function.
+
+	* gdb.base/ena-dis-br.exp: Clean up for remote targets.
+	* gdb.base/ending-run.exp: Ditto.
+	* gdb.base/step-test.exp: Ditto.
+
+1999-03-16  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* gdb.base/miscexprs.c: Clean up file, clear cbig.c[0] explicitly
+	(suggested by Art Haas <ahaas@neosoft.com>).
+
+1999-03-16  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+ 	* gdb.base/signals.exp: Filter out *-*-linux* before matching *-*-gnu*.
+
+Fri Mar 12 18:06:21 1999  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* gdb.c++/ref-types.exp, ref-types2.exp: Allow alternate
+ 	descriptions of types (short unsigned int vs unsigned short, etc).
+
+1999-03-12  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	* gdb.base/call-strs.exp: Don't assume that `step' will step over
+	a call to strlen; sometimes we do have sources.
+
+1999-03-08  Jim Blandy  <jimb@zwingli.cygnus.com>
 
 	* gdb.base/call-ar-st.c (main): Terminate char_array with a null
  	character, so GDB won't print garbage after its end.
@@ -26,22 +159,29 @@
 	* gdb.base/step-test.exp: Rewrite `stepi' and `nexti' tests to be
 	more portable.
 
+1999-03-08  Jim Blandy  <jimb@zwingli.cygnus.com>
+
 	* lib/gdb.exp: Doc fixes.
 
+1999-03-05  Nick Clifton  <nickc@cygnus.com>
+
+	* gdb.base/a2-run.exp: Add expected fails for strongarm-coff. 
+
+1999-03-04  Jim Blandy  <jimb@zwingli.cygnus.com>
+
 	* gdb.base/display.exp: Don't exercise the "detach" and "kill"
  	commands.  They're not germane to this test, and they don't work
  	that way on remote targets.
 
+1999-02-25  Felix Lee  <flee@cygnus.com>
+
+	* lib/gdb.exp (debug_format): initialize
+
 1999-02-25  Jason Molenda  (jsm@bugshack.cygnus.com)
 
 	* gdb.base/call-ar-st.c: Include string.h, not strings.h.
 	* gdb.base/call-rt-st.c: Ditto.
 
-1999-02-23  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* configure.in: Formatting fix.
-	* configure: Regenerated.
-
 1999-02-13  Jim Blandy  <jimb@zwingli.cygnus.com>
 
 	* gdb.threads/pthreads.exp (horiz): New variable.
@@ -263,6 +403,7 @@ Wed Jan  6 18:41:15 1999  David Taylor  <taylor@texas.cygnus.com>
 	* gdb.base/varargs.exp: new file.
 	* gdb.base/volatile.exp: new file.
 	* gdb.base/whatis-exp.exp: new file.
+	* gdb.base/display.exp: new file.
 	* gdb.c++/derivation.exp: new file.
 	* gdb.c++/local.exp: new file.
 	* gdb.c++/member-ptr.exp: new file.
@@ -549,6 +690,7 @@ Thurs Jul 9 11:08:31 1998  Dawn Perchik  <dawn@cygnus.com>
 	* gdb.base/commands.exp: Break up infrun_breakpoint_command_test 
 	into two parts to get around a synchronization problem in expect.
 
+
 Fri Jun 26 14:52:47 1998  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
 
 	* gdb.fortran/types.exp:  Escape brackets in expect patterns
diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp
index 0d381a2..727ef53 100644
--- a/gdb/testsuite/config/monitor.exp
+++ b/gdb/testsuite/config/monitor.exp
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 
 load_lib gdb.exp
-
+puts "***** DID USE MONITOR ******"
 #
 # gdb_target_monitor
 # Set gdb to target the monitor
@@ -35,6 +35,9 @@ proc gdb_target_monitor { exec_file } {
     if [target_info exists baud] {
 	gdb_test "set remotebaud [target_info baud]" "" ""
     }
+    if [target_info exists binarydownload] {
+	gdb_test "set remotebinarydownload [target_info binarydownload]" "" ""
+    }
     if [target_info exists gdb_serial] {
        set serialport "[target_info gdb_serial]";
     } elseif [target_info exists netport] {
diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure
index bf663a2..2796fe7 100755
--- a/gdb/testsuite/configure
+++ b/gdb/testsuite/configure
@@ -13,6 +13,8 @@ ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
   --enable-shared         use shared libraries"
+ac_help="$ac_help
+  --enable-gdbtk "
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -573,7 +575,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:577: checking host system type" >&5
+echo "configure:579: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -594,7 +596,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:598: checking target system type" >&5
+echo "configure:600: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -612,7 +614,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:616: checking build system type" >&5
+echo "configure:618: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
index 87a0edf..4341d27 100644
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ b/gdb/testsuite/gdb.base/a2-run.exp
@@ -109,7 +109,7 @@ if [istarget "*-*-vxworks*"] then {
     verbose "Timeout is now $timeout seconds" 2
     gdb_expect -re "$gdb_prompt $" {}
 } else {
-	setup_xfail "mips-idt-*" "arm-*-coff"
+	setup_xfail "mips-idt-*" "arm-*-coff strongarm-*-coff"
 	gdb_run_cmd 5
 	gdb_expect {
 	    -re ".*120.*$gdb_prompt $"\
@@ -137,7 +137,7 @@ if [istarget "*-*-vxworks*"] then {
     verbose "Timeout is now $timeout seconds" 2
     gdb_expect -re "$gdb_prompt $" {}
 } else {
-    setup_xfail "arm-*-coff"
+    setup_xfail "arm-*-coff strongarm-*-coff"
     gdb_expect {
 	    -re ".*120.*$gdb_prompt $"\
 				{ pass "run \"$testfile\" again with same args" }
@@ -215,7 +215,7 @@ if [istarget "*-*-vxworks*"] then {
     verbose "Timeout is now $timeout seconds" 2
     gdb_expect -re "$gdb_prompt $" {}
 } else {
-    setup_xfail "arm-*-coff"
+    setup_xfail "arm-*-coff strongarm-*-coff"
     gdb_expect {
 	    -re ".*720.*$gdb_prompt $" {
 		pass "run \"$testfile\" again after setting args"
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index b8f1d7f..300a4e6 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -574,12 +574,18 @@ gdb_expect {
 }
 
 # Verify that GDB responds gracefully to a request to "finish" from
-# the outermost frame.
+# the outermost frame.  On a stub that never exits, this will just
+# run to the stubs routine, so we don't get this error...  Thus the 
+# second condition.
 #
+
 send_gdb "finish\n"
 gdb_expect {
   -re "\"finish\" not meaningful in the outermost frame.\r\n$gdb_prompt $"\
           {pass "finish from outermost frame disallowed"}
+  -re "Run till exit from.*" {
+     pass "finish from outermost frame disallowed"
+  }
   -re "$gdb_prompt $"\
           {fail "finish from outermost frame disallowed"}
   timeout {fail "(timeout) finish from outermost frame disallowed"}
@@ -743,18 +749,8 @@ proc test_next_with_recursion {} {
     if { $result != 0 } { gdb_suppress_tests }
 
     if [target_info exists gdb,noresults] { gdb_suppress_tests }
-    if [target_info exists use_gdb_stub] {
-	gdb_breakpoint "exit"
-	gdb_test "continue" "Continuing..*Breakpoint .*exit \[(\].*=0\[)\].*" "continue until exit in recursive next test"
-    } else {
-    # Continue until we exit.  Should not stop again.
-    # Don't bother to check the output of the program, that may be
-    # extremely tough for some remote systems.
-	gdb_test "continue"\
-		"Continuing.\[\r\n0-9\]+Program exited normally\\..*"\
-		"continue until exit in recursive next test"
-    }
-    gdb_stop_suppressing_tests;
+  gdb_continue_to_end "recursive next test"
+   gdb_stop_suppressing_tests;
 }
 
 test_clear_command
diff --git a/gdb/testsuite/gdb.base/call-ar-st.c b/gdb/testsuite/gdb.base/call-ar-st.c
index c61977a..bb30e50 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.c
+++ b/gdb/testsuite/gdb.base/call-ar-st.c
@@ -994,7 +994,7 @@ int main ()  {
   for (index = 0; index < 120; index++) {
       if ((index%2) == 0) char_array[index] = 'Z';
 	 else char_array[index] = 'a';
-  } /* call-ar-st.exp uses line numbers everywhere */ char_array[120] = '\0';
+  } char_array[120] = '\0'; /* call-ar-st.exp uses line numbers everywhere */
 
   for (index = 0; index < 100; index++) {
       double_array[index] = index*23.4567;
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index d8ed4fe..d408cf1 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -123,6 +123,7 @@ gdb_expect {
 
 
 #call print_char_array(char_array)
+
 send_gdb "print print_char_array(char_array)\n"
 gdb_expect {
     -re "array_c :\[ \t\r\n\]+=========\[ \t\r\n\]+\[ \t\r\n\]+Z\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZa\[ \t\r\n\]+\[ \t\r\n\]+.*\[ \t\r\n\]+.*$gdb_prompt $" {
@@ -222,7 +223,7 @@ gdb_expect {
 #step -over
     send_gdb "next\n"
     gdb_expect {
-        -re "BYE BYE FOR NOW\[ \t\r\n\]+1035\[ \t\r\n\]+printf\\(.VERY GREEN GRASS.n.\\);\[ \t\r\n\]+.*$gdb_prompt $" { pass "next to 1035"}
+        -re "BYE BYE FOR NOW\[ \t\r\n\]main.*+1035\[ \t\r\n\]+printf\\(.VERY GREEN GRASS.n.\\);\[ \t\r\n\]+.*$gdb_prompt $" { pass "next to 1035"}
         -re ".*$gdb_prompt $" { fail "next to 1035" }
         timeout { fail "next to 1035(timeout)" }
     }
@@ -235,7 +236,7 @@ gdb_expect {
         pass "print print_array_rep(*list1, *list2, *list3)"
       }
     -re ".*$gdb_prompt $" { fail "print print_array_rep(*list1, *list2, *list3)" }
-    timeout           { fail "(timeout) print print_array_rep(*list1, *list2, *list3)"# }
+    timeout           { fail "(timeout) print print_array_rep(*list1, *list2, *list3)" }
   }
 
 
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index 20f358a..1d4cc4a 100644
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -107,11 +107,11 @@ gdb_expect {
 
 
 #step
-send_gdb "step\n"
+send_gdb "next\n"
 gdb_expect {
-        -re ".*str_func\\(\"abcd\", \"efgh\", \"ijkl\", \"mnop\", \"qrst\", \"uvwx\", \"yz12\"\\);.*$gdb_prompt $" {pass "step after strcpy"}
-        -re ".*$gdb_prompt $" { fail "step after strcpy" }
-        timeout { fail "step after strcpy (timeout)" }
+        -re ".*str_func\\(\"abcd\", \"efgh\", \"ijkl\", \"mnop\", \"qrst\", \"uvwx\", \"yz12\"\\);.*$gdb_prompt $" {pass "next over strcpy"}
+        -re ".*$gdb_prompt $" { fail "next over strcpy" }
+        timeout { fail "next over strcpy (timeout)" }
     }
 
 #print buf
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index f70ac6b..72356ec 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -236,6 +236,55 @@ proc user_defined_command_test {} {
    gdb_test "show user mycommand" "while.*set.*if.*p/x.*else.*p/x.*end.*" "display user command in user_defined_command_test"
 }
 
+
+
+proc test_command_prompt_position {} {
+    global gdb_prompt
+
+    if [target_info exists noargs] { 
+        verbose "Skipping test_command_prompt_position because of noargs."
+        return
+    }
+
+    if { ![runto factorial] } then { gdb_suppress_tests; }
+    # Don't depend upon argument passing, since most simulators don't currently
+    # support it.  Bash value variable to be what we want.
+    delete_breakpoints
+    gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #2"
+    gdb_test "p value=5" "" "set value to 5 in test_command_prompt_position"
+    # All this test should do is print 0xdeadbeef once.
+    gdb_test "if value == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" "\\\$\[0-9\]* = 0xdeadbeef" "if test in test_command_prompt_position"
+
+# Now let's test for the correct position of the '>' in gdb's prompt for commands.
+# It should be at the beginning of the line, and not after one space.
+
+    send_gdb "commands\n"
+    gdb_expect {
+	    -re "Type commands.*End with.*\[\r\n\]>$" \
+                { send_gdb "printf \"Now the value is %d\\n\", value\n"
+	          gdb_expect {
+                          -re "^printf.*value\r\n>$" \
+			       { send_gdb "end\n"
+                                 gdb_expect {
+			               -re "^end\r\n$gdb_prompt $" { pass "> OK in test_command_prompt_position" }
+				       -re ".*$gdb_prompt $" { fail "some other message in test_command_prompt_position" }
+				       timeout  { fail "(timeout) 1 in test_command_prompt_position" }
+				 }
+			       }
+			   -re "^ >$" { fail "> not OK in test_command_prompt_position" }
+			   -re ".*$gdb_prompt $"   { fail "wrong message in test_command_prompt_position" }
+			   timeout    { fail "(timeout) 2 in test_command_prompt_position " }
+		       }
+		 }
+		 -re "Type commands.*End with.*\[\r\n\] >$" { fail "prompt not OK in test_command_prompt_position" }
+	   -re ".*$gdb_prompt $" { fail "commands in test_command_prompt_position" }
+	   timeout { fail "(timeout) 3 commands in test_command_prompt_position" }
+	}
+
+    gdb_stop_suppressing_tests;
+}
+
+
 gdbvar_simple_if_test
 gdbvar_simple_while_test
 gdbvar_complex_if_while_test
@@ -246,3 +295,8 @@ if_while_breakpoint_command_test
 infrun_breakpoint_command_test
 breakpoint_command_test
 user_defined_command_test
+test_command_prompt_position
+
+
+
+
diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
index 76f7521..cf9deba 100644
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ b/gdb/testsuite/gdb.base/condbreak.exp
@@ -118,11 +118,11 @@ gdb_test "info break" \
 
 
 #
-# run until the breakpoint at main is hit. For non-stubs-using targets.
+# run until the breakpoint at main is hit.
 #
-gdb_test "run" \
-    "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:60.*60\[\t \]+if .argc.* \{.*" \
-"run until function breakpoint"
+
+
+gdb_run_cmd
 
 #
 # run until the breakpoint at a line number
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index 8e1506a..2a342aa 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -40,6 +40,8 @@ gdb_expect {
 			{ pass "attach" }
     -re "You can't do that when your target is `None'.*$gdb_prompt $"\
 			{ pass "attach" }
+    -re "You can't do that without a process to debug.*$gdb_prompt $"\
+			{ pass "attach" }
     -re "Don't know how to attach.  Try \"help target\"..*$gdb_prompt $"\
 			{ pass "attach" }
     -re "Kill it. .y or n." {
@@ -295,6 +297,8 @@ if [istarget "arm-*-*"] then {
     gdb_test "info float" "Software FPU type.*mask:.*flags:.*" "info float"
 } elseif [istarget "thumb-*-*"] then {
     gdb_test "info float" "Software FPU type.*mask:.*flags:.*" "info float"
+} elseif [istarget "strongarm-*-*"] then {
+    gdb_test "info float" "Software FPU type.*mask:.*flags:.*" "info float"
 } else {
     gdb_test "info float" "No floating point info available for this processor." "info float"
 }
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index f5c2641..638072c 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -49,8 +49,10 @@ gdb_load ${binfile}
 
 # Ok, on to real life
 #
-gdb_test "b main"     ".*Breakpoint 1.*" "break main"
-gdb_test "r"          ".*Breakpoint 1, main.*" "get to main"
+
+if {![runto main]} {
+  fail "Could not run to main - other tests will fail."
+}
 gdb_test "b 14" ".*Breakpoint 2.*" "break do_loops"
 gdb_test "c"          ".*Breakpoint 2, do_loops.*" "get to do_loops"
 
diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp
index 6593d82..f5656d8 100644
--- a/gdb/testsuite/gdb.base/ena-dis-br.exp
+++ b/gdb/testsuite/gdb.base/ena-dis-br.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
 
 
 # This program is free software; you can redistribute it and/or modify
@@ -38,6 +38,30 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
 
+proc rerun_to_main {} {
+  global gdb_prompt
+
+  if [target_info exists use_gdb_stub] {
+    gdb_run_cmd
+    gdb_expect {
+      -re ".*Breakpoint .*main .*$gdb_prompt $"\
+	      {pass "rerun to main" ; return 0}
+      -re "$gdb_prompt $"\
+	      {fail "rerun to main" ; return 0}
+      timeout {fail "(timeout) rerun to main" ; return 0}
+    }
+  } else {
+    send_gdb "run\n"
+    gdb_expect {
+      -re "Starting program.*$gdb_prompt $"\
+	      {pass "rerun to main" ; return 0}
+      -re "$gdb_prompt $"\
+	      {fail "rerun to main" ; return 0}
+      timeout {fail "(timeout) rerun to main" ; return 0}
+    }
+  }
+}
+
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
@@ -137,32 +161,9 @@ gdb_expect {
 
 # Verify that we don't stop at a disabled breakpoint.
 #
-send_gdb "continue\n"
-gdb_expect {
-  -re ".*Program exited normally.*$gdb_prompt $"\
-          {pass "no stop"}
-  -re "$gdb_prompt $"\
-          {fail "no stop"}
-  timeout {fail "(timeout) no stop"}
-}
-
-send_gdb "run\n"
-gdb_expect {
-  -re "Starting program.*$gdb_prompt $"\
-          {pass "rerun to main"}
-  -re "$gdb_prompt $"\
-          {fail "rerun to main"}
-  timeout {fail "(timeout) rerun to main"}
-}
-
-send_gdb "continue\n"
-gdb_expect {
-  -re ".*Program exited normally.*$gdb_prompt $"\
-          {pass "no stop at auto-disabled break marker2"}
-  -re "$gdb_prompt $"\
-          {fail "no stop at auto-disabled break marker2"}
-  timeout {fail "(timeout) no stop at auto-disabled break marker2"}
-}
+gdb_continue_to_end "no stop"
+rerun_to_main
+gdb_continue_to_end "no stop at auto-disabled break marker2"
 
 # Verify that we can set a breakpoint to be self-deleting after
 # the first time it triggers.
@@ -321,23 +322,8 @@ gdb_expect {
   timeout {fail "(timeout) info ignored break marker1"}
 }
 
-send_gdb "continue\n"
-gdb_expect {
-  -re ".*Program exited normally.*$gdb_prompt $"\
-          {pass "no stop at ignored break marker1"}
-  -re "$gdb_prompt $"\
-          {fail "no stop at ignored break marker1"}
-  timeout {fail "(timeout) no stop at ignored break marker1"}
-}
-
-send_gdb "run\n"
-gdb_expect {
-  -re "Starting program.*$gdb_prompt $"\
-          {pass "rerun to main"}
-  -re "$gdb_prompt $"\
-          {fail "rerun to main"}
-  timeout {fail "(timeout) rerun to main"}
-}
+gdb_continue_to_end "no stop at ignored break marker1"
+rerun_to_main
 
 send_gdb "continue\n"
 gdb_expect {
@@ -386,23 +372,8 @@ gdb_expect {
   timeout {fail "(timeout) info break marker2"}
 }
 
-send_gdb "continue\n"
-gdb_expect {
-  -re ".*Program exited normally.*$gdb_prompt $"\
-          {pass "no stop at ignored & auto-deleted break marker1"}
-  -re "$gdb_prompt $"\
-          {fail "no stop at ignored & auto-deleted break marker1"}
-  timeout {fail "(timeout) no stop at ignored & auto-deleted break marker1"}
-}
-
-send_gdb "run\n"
-gdb_expect {
-  -re "Starting program.*$gdb_prompt $"\
-          {pass "rerun to main"}
-  -re "$gdb_prompt $"\
-          {fail "rerun to main"}
-  timeout {fail "(timeout) rerun to main"}
-}
+gdb_continue_to_end "no stop at ignored & auto-deleted break marker1"
+rerun_to_main
 
 send_gdb "continue\n"
 gdb_expect {
@@ -445,23 +416,8 @@ gdb_expect {
   timeout {fail "(timeout) disable break marker1"}
 }
 
-send_gdb "continue\n"
-gdb_expect {
-  -re ".*Program exited normally.*$gdb_prompt $"\
-          {pass "no stop at ignored & disabled break marker1"}
-  -re "$gdb_prompt $"\
-          {fail "no stop at ignored & disabled break marker1"}
-  timeout {fail "(timeout) no stop at ignored & disabled break marker1"}
-}
-
-send_gdb "run\n"
-gdb_expect {
-  -re "Starting program.*$gdb_prompt $"\
-          {pass "rerun to main"}
-  -re "$gdb_prompt $"\
-          {fail "rerun to main"}
-  timeout {fail "(timeout) rerun to main"}
-}
+gdb_continue_to_end "no stop at ignored & disabled break marker1"
+rerun_to_main
 
 send_gdb "info break $expect_out(1,string)\n"
 gdb_expect {
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 61b42c7..da78e3b 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -61,7 +61,11 @@ gdb_test "b 26" ".*Breakpoint.*3.*" ""
 # Expect to hit the bp at line "1", but symbolize this
 # as line "8".  Then try to clear it--this should work.
 #
-gdb_test "r" ".*Breakpoint.*1.*callee.*8.*" ""
+if [target_info exists use_gdb_stub] {
+  gdb_test "continue" ".*Breakpoint.*1.*callee.*8.*" ""
+} else {
+  gdb_test "r" ".*Breakpoint.*1.*callee.*8.*" ""
+}
 gdb_test "cle" ".*Deleted breakpoints 2 1.*" "clear worked"
 send_gdb "i b\n"
 gdb_expect {
@@ -147,24 +151,30 @@ gdb_expect {
     -re ".*in.*start.*$gdb_prompt $" { 
         pass "step out of main"
     }
+  -re ".*Program received signal SIGTRAP.*$gdb_prompt $" {
+        pass "Cygmon stopped in ending trap."
+  }
     timeout { fail "hang or timeout on step at end 1" }
 }
 
-gdb_test "n" ".*Single.*Program exited.*" "step to end of run"
-set timeout $old_timeout
-
-gdb_test "n" ".*The program is not being run.*" "don't step after run"
-
-set exec_output [remote_exec host "ls core"]
-
-if [ regexp "core not found" $exec_output]  {
+if {![target_info exists use_cygmon] || ![target_info use_cygmon]} {
+  gdb_test "n" ".*Single.*Program exited.*" "step to end of run"
+  set timeout $old_timeout
+  
+  gdb_test "n" ".*The program is not being run.*" "don't step after run"
+  
+  set exec_output [remote_exec host "ls core"]
+  
+  
+  if [ regexp "core not found" $exec_output]  {
     pass "No core dumped on quit"
-} else {
-  if [ regexp "No such file or directory" $exec_output] {
-      pass "ls: core: No core dumped on quit"
   } else {
+    if [ regexp "No such file or directory" $exec_output] {
+      pass "ls: core: No core dumped on quit"
+    } else {
       remote_exec build "rm -f core"
       fail "Core dumped on quit"
+    }
   }
 }
 
diff --git a/gdb/testsuite/gdb.base/miscexprs.c b/gdb/testsuite/gdb.base/miscexprs.c
index cae23d8..41bd29f 100644
--- a/gdb/testsuite/gdb.base/miscexprs.c
+++ b/gdb/testsuite/gdb.base/miscexprs.c
@@ -1,165 +1,49 @@
-void marker1 ()
+void
+marker1 ()
 {
-    
+   
 }
-/*
-static struct {
-    char c[100];
-} cbig;
-
-
-static struct {
-    int i[800];
-} ibig;
-
-
-static struct {
-    long l[900];
-} lbig;
-
-static struct {
-    float f[200];
-} fbig;
-
-static struct {
-    double d[300];
-} dbig;
-
-static struct {
-    short s[400];
-} sbig;*/
 
-/*struct {
-    long l[900];
-} lbig;*/
-
-int main()
+int
+main ()
 {
-
-struct {
+  struct {
     char c[100];
-} cbig;
-
+  } cbig;
 
-struct {
+  struct {
     int i[800];
-} ibig;
+  } ibig;
 
-
-struct {
+  struct {
     long l[900];
-} lbig;
+  } lbig;
 
-struct {
+  struct {
     float f[200];
-} fbig;
+  } fbig;
 
-struct {
+  struct {
     double d[300];
-} dbig;
+  } dbig;
 
-struct {
+  struct {
     short s[400];
-} sbig; 
-    ibig.i[100] = 5;
-    cbig.c[100] = 'A';
-    fbig.f[100] = 11.99999;
-    dbig.d[202] = 9.99999999;
-    sbig.s[90] = 255;
-    lbig.l[333] = 999999999;
+  } sbig;
+
+  ibig.i[100] = 5;
+  cbig.c[0] = '\0';
+  cbig.c[100] = 'A';
+  fbig.f[100] = 11.99999;
+  dbig.d[202] = 9.99999999;
+  sbig.s[90] = 255;
+  lbig.l[333] = 999999999;
     
-    #ifdef usestubs
-       set_debug_traps();
-       breakpoint();
-    #endif
-    marker1();
-    return 0;
+#ifdef usestubs
+  set_debug_traps ();
+  breakpoint ();
+#endif
 
+  marker1 ();
+  return 0;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index 9ea278a..d42e5ab 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -114,18 +114,24 @@ gdb_expect {
 
 send_gdb "print &sbig.s\[0\]\n"
 gdb_expect {
+    -re ".\[0-9\]* = \\(short \\*\\) $hex.*$gdb_prompt $" {
+        pass "print value of &sbig.s\[0\]"
+    }
     -re ".\[0-9\]* = \\(short int \\*\\) $hex.*$gdb_prompt $" {
         pass "print value of &sbig.s\[0\]"
-      }
+    }
     -re ".*$gdb_prompt $" { fail "print value of &sbig.s\[0\]" }
     timeout           { fail "(timeout) print value of &sbig.s\[0\]" }
   }
 
 send_gdb "print &lbig.l\[0\]\n"
 gdb_expect {
+    -re ".\[0-9\]* = \\(long \\*\\) $hex.*$gdb_prompt $" {
+        pass "print value of &lbig.l\[0\]"
+    }
     -re ".\[0-9\]* = \\(long int \\*\\) $hex.*$gdb_prompt $" {
         pass "print value of &lbig.l\[0\]"
-      }
+    }
     -re ".*$gdb_prompt $" { fail "print value of &lbig.l\[0\]" }
     timeout           { fail "(timeout) print value of &lbig.l\[0\]" }
   }
diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp
index 765e0ee..7559978 100644
--- a/gdb/testsuite/gdb.base/sigall.exp
+++ b/gdb/testsuite/gdb.base/sigall.exp
@@ -205,6 +205,6 @@ gdb_test "continue" \
     "Continuing.*Program received signal SIGTERM.*" \
     "get signal TERM"
 gdb_test "continue" "Breakpoint.*handle_TERM.*" "send signal TERM"
-gdb_test "continue" "Program exited normally\\." "continue to sigall exit"
+gdb_continue_to_end "continue to sigall exit"
 
 return 0
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index 49bf490..16528f7 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -336,7 +336,9 @@ proc test_handle_all_print {} {
     set oldtimeout $timeout
     set timeout [expr "$timeout + 360"]
     verbose "Timeout is now $timeout seconds" 2
-    if { [istarget "*-*-gnu*"] || [istarget "*-*-mach*"] } {
+    if { ![istarget "*-*-linux*"]
+         && ( [istarget "*-*-gnu*"]
+              || [istarget "*-*-mach*"] ) } {
 	gdb_test "handle all print" "Signal\[ 	\]+Stop\[ 	\]+Print\[ 	\]+Pass to program\[ 	\]+Description\r\nSIGHUP\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Hangup.*SIG63\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Real-time event 63.*EXC_BREAKPOINT\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Breakpoint"
     } else {
 	gdb_test "handle all print" "Signal\[ 	\]+Stop\[ 	\]+Print\[ 	\]+Pass to program\[ 	\]+Description\r\nSIGHUP\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Hangup.*SIG63\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Real-time event 63"
diff --git a/gdb/testsuite/gdb.base/smoke.exp b/gdb/testsuite/gdb.base/smoke.exp
index 42de7c8..af107e0 100644
--- a/gdb/testsuite/gdb.base/smoke.exp
+++ b/gdb/testsuite/gdb.base/smoke.exp
@@ -58,7 +58,7 @@ gdb_test "r" ".*Starting program.*main.*15.*"   "hit bp"
 gdb_test "hel r" ".*Start debugged program.*without arguments.*" "help"
 gdb_test "n" ".*x = 1;.*" "next"
 gdb_test "s" ".*y = 2;.*" "step"
-gdb_test "p/t y" ".* = 1.*" "print y in binary"
+gdb_test "p/t x" ".* = 1.*" "print x in binary"
 gdb_test "p 1+2*3+4" ".* = 11.*" "calculate"
 gdb_test "p/t 1+2*3+4" ".* = 1011.*" "binary"
 
diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp
index 415714d..85744d7 100644
--- a/gdb/testsuite/gdb.base/step-test.exp
+++ b/gdb/testsuite/gdb.base/step-test.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -46,6 +46,9 @@ if ![runto_main] then {
    return 0
 }
 
+# Set a breakpoint at line 45, if stepi then finish fails, we would
+# run to the end of the program, which would mess up the rest of the tests.
+  
 # Vanilla step/next
 #
 gdb_test "next" ".*${decimal}.*x = 1;.*" "next 1"
@@ -127,8 +130,41 @@ test_i "stepi to next line" "stepi" \
        ".*${decimal}.*callee.*STEPI"
 test_i "stepi into function" "stepi" \
        ".*${decimal}.*callee.*STEPI" \
-       ".*callee \\(\\) at .*step-test\\.c"
-gdb_test "finish"  ".*${decimal}.*callee.*NEXTI.*" "stepi: finish call"
+       ".*callee \\(\\) at .*step-test\\.c" 
+# Have to be careful here, if the finish does not work, 
+# then we may run to the end of the program, which
+# will cause erroneous failures in the rest of the tests
+
+send_gdb "finish\n"
+gdb_expect {
+  -re ".*(Program received|Program exited).*$gdb_prompt $" {
+    puts "*** Matched Program recieved"
+    # Oops... We ran to the end of the program...  Better reset     
+    if {![runto_main]} then {
+      fail "Can't run to main"
+      return 0
+    }
+    if {![runto step-test.c:45]} {
+      fail "Can't run to line 45"
+      return 0
+    }
+    fail "stepi: finish call"
+  }
+  -re ".*${decimal}.*callee.*NEXTI.*$gdb_prompt $" {
+    puts "*** Matched success..."
+    pass "stepi: finish call"
+  }
+  -re "$gdb_prompt $" {
+    # We got something else.  Fail.
+    fail "stepi: finish call"
+    return
+  }
+  timeout {
+    fail "stepi: finish call"
+    return
+  }
+}
+
 test_i "nexti over function" "nexti" \
        ".*${decimal}.*callee.*NEXTI" \
        ".*${decimal}.*y = w \\+ z;"
@@ -148,6 +184,6 @@ gdb_test "step" \
          ".*step-test.exp: arrive here 1.*" \
          "large struct by value"
 
-gdb_test "continue" ".*Program exited normally.*" "run to finish"
+gdb_continue_to_end "step-test.exp"
 
 return 0
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index a295445..53f2e8b 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -209,8 +209,7 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count
 
     if [target_info exists gdb,noresults] { return }
 
-    gdb_test "cont" "Continuing.*Program exited normally.*" \
-	"continue to exit in test_simple_watchpoint"
+    gdb_continue_to_end "continue to exit in test_simple_watchpoint"
 }
 
 # Test disabling watchpoints.
@@ -280,8 +279,7 @@ proc test_disabling_watchpoints {} {
     
     if [target_info exists gdb,noresults] { return }
 
-    gdb_test "cont" "Continuing.*Program exited normally.*" \
-	"continue to exit in test_disabling_watchpoints"
+    gdb_continue_to_end "continue to exit in test_disabling_watchpoints"
 }
 
 # Test stepping and other mundane operations with watchpoints enabled
@@ -475,8 +473,7 @@ proc test_watchpoint_triggered_in_syscall {} {
 
 	if [target_info exists gdb,noresults] { return }
 
-	gdb_test "cont" "Continuing.*Program exited normally.*" \
-	    "continue to exit in test_watchpoint_triggered_in_syscall"
+	gdb_continue_to_end "continue to exit in test_watchpoint_triggered_in_syscall"
     }
 }
 
@@ -504,8 +501,7 @@ proc test_complex_watchpoint {} {
 	if [target_info exists gdb,noresults] { return }
 
 
-	gdb_test "cont" "Continuing.*Program exited normally.*" \
-	    "continue to exit in test_complex_watchpoint"
+        gdb_continue_to_end "continue to exit in test_complex_watchpoint"
     }
 }
 
diff --git a/gdb/testsuite/gdb.c++/classes.exp b/gdb/testsuite/gdb.c++/classes.exp
index 5e97cb4..05a6cde 100644
--- a/gdb/testsuite/gdb.c++/classes.exp
+++ b/gdb/testsuite/gdb.c++/classes.exp
@@ -774,15 +774,15 @@ do_tests
 
 
 # set a breakpoint and go there
-send_gdb "break 498\n"   
+send_gdb "break 503\n"   
 gdb_expect {   
-   -re "Breakpoint \[0-9\] at.*$gdb_prompt $" { pass "set break 498" }
-   -re "$gdb_prompt $"                     { fail "set break 498" }
-   timeout                             { fail "(timeout) set break 498" }
+   -re "Breakpoint \[0-9\] at.*$gdb_prompt $" { pass "set break 503" }
+   -re "$gdb_prompt $"                     { fail "set break 503" }
+   timeout                             { fail "(timeout) set break 503" }
 }
 send_gdb "continue\n"   
 gdb_expect {   
-   -re "Continuing\\.\r\n\r\nBreakpoint \[0-9\]*, main....at.*misc\\.cc:498\r\n498.*\r\n$gdb_prompt $" { pass "continue" }
+   -re "Continuing\\.\r\n\r\nBreakpoint \[0-9\]*, main....at.*misc\\.cc:503\r\n503.*\r\n$gdb_prompt $" { pass "continue" }
    -re "$gdb_prompt $"                     { fail "continue" }
    timeout                             { fail "(timeout) continue" }
 }
@@ -818,9 +818,12 @@ gdb_expect {
 }
 
 # ptype on the enum member
+# The second success case is a little dubious, but it's not clear what
+# ought to be required of a ptype on a private enum... -sts 19990324
 send_gdb "ptype obj_with_enum.priv_enum\n"   
 gdb_expect {   
    -re "type = enum ClassWithEnum::PrivEnum \\{red, green, blue, yellow = 42\\}.*$gdb_prompt $" { pass "ptype obj_with_enum.priv_enum" }
+   -re "type = enum \\{red, green, blue, yellow = 42\\}.*$gdb_prompt $" { pass "ptype obj_with_enum.priv_enum" }
    -re "$gdb_prompt $"                     { fail "ptype obj_with_enum.priv_enum" }
    timeout                             { fail "(timeout) ptype obj_with_enum.priv_enum" }
 }
diff --git a/gdb/testsuite/gdb.c++/demangle.exp b/gdb/testsuite/gdb.c++/demangle.exp
index fd1d344..7f9f174 100644
--- a/gdb/testsuite/gdb.c++/demangle.exp
+++ b/gdb/testsuite/gdb.c++/demangle.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1997, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,432 +20,516 @@
 # This file was written by Fred Fish. (fnf@cygnus.com)
 
 if $tracelevel then {
-	strace $tracelevel
+    strace $tracelevel
 }
 
-#
-#  Test gnu style name demangling
-#
+### The demangling style we last sent to GDB.
+set current_demangling_style none
 
-proc test_gnu_style_demangling {} {
+### Set GDB's current demangling style to STYLE.  Subsequent calls to
+### test_demangle will include STYLE in the test name when reporting
+### passes and failures.
+proc set_demangling_style {style} {
     global gdb_prompt
+    global current_demangling_style
 
-    # Set the demangling style to "gnu" and then check to make sure
-    # it really got set.  Return if the style failed to get set for
-    # some reason.
-
-    send_gdb "set demangle-style gnu\n"
+    send_gdb "set demangle-style $style\n"
     gdb_expect {
-	-re "set demangle-style gnu\[\r\n\]+$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" { fail "set demangle-style gnu failed" ; return }
-	timeout { fail "set demangle-style gnu failed (timeout)" ; return }
+	-re "set demangle-style $style\[\r\n\]+$gdb_prompt $" {
+	    pass "$style: set demangle-style"
+	}
+	-re ".*$gdb_prompt $" {
+	    fail "$style: set demangle-style"
+	    error "set_demangling_style: set style"
+	}
+	timeout { 
+	    fail "$style: set demangle-style (timeout)"
+	    error "set_demangling_style: set style"
+	}
     }
 
     send_gdb "show demangle-style\n"
     gdb_expect {
-	-re "The current C\[+\]+ demangling style is \"gnu\".\r\n$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" { fail "demangling style not set to gnu" }
-	timeout { fail "show demangle-style timed out" }
+	-re "The current C\[+\]+ demangling style is \"$style\".\r\n$gdb_prompt $" { 
+	    pass "$style: check demangling style"
+	}
+	-re ".*$gdb_prompt $" {
+	    fail "gnu: check demangling style"
+	    error "set_demangling_style: check style"
+	}
+	timeout { 
+	    fail "gnu: check demangling style (timeout)" 
+	    error "set_demangling_style: check style"
+	}
     }
 
-    gdb_test "maint dem Abort__FP6EditoriPCc" \
+    set current_demangling_style $style
+}
+
+
+### Utility function for test_demangling and test_demangling_exact.
+proc test_demangling_core {tester test result} {
+    global current_demangling_style
+
+    if {! [regexp {^([^ ]+): (.+)$} $test dummy style name]} {
+      error "bad test name passed to test_demangling"
+    }
+
+    if {[string compare $style $current_demangling_style]} {
+	set_demangling_style $style
+    }
+
+    $tester "maintenance demangle $name" $result $test
+}
+
+### Demangle an identifier, and check that the result matches a pattern.
+###
+### TEST should be of the form "STYLE: NAME", where STYLE is the name
+### of a demangling style (like "gnu" or "arm"), and NAME is a mangled
+### identifier to demangle.  Pass when the result matches the regular
+### expression RESULT.  Report passes and fails using TEST as the name
+### of the test.
+###
+### Why don't we just pass the STYLE and NAME as two separate
+### arguments, or let the style be a global variable?  That would be
+### cleaner.  However, doing it this way means that:
+### 
+### 1) the name of the test, as recorded in the summary and log,
+### appears verbatim in the script, and
+### 
+### 2) that test names are unique, even though we try to demangle the same
+### identifiers using several different mangling styles.
+### 
+### This makes it a lot easier for people tracking down failures to
+### find the one they care about.
+
+proc test_demangling {test result} {
+    test_demangling_core gdb_test $test $result
+}
+
+### Like test_demangling, above, except that RESULT is not a regexp,
+### but a string that must match exactly.
+
+proc test_demangling_exact {test result} {
+    test_demangling_core gdb_test_exact $test $result
+}
+
+
+
+#
+#  Test gnu style name demangling
+#
+
+proc test_gnu_style_demangling {} {
+    test_demangling "gnu: Abort__FP6EditoriPCc" \
 	"Abort\[(\]+Editor \[*\]+, int, (const char|char const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle AddAlignment__9ivTSolverUiP12ivInteractorP7ivTGlue" "ivTSolver::AddAlignment(unsigned int, ivInteractor *, ivTGlue *)"
-    gdb_test "maint dem Append__15NameChooserViewPCc" \
+    test_demangling_exact "gnu: AddAlignment__9ivTSolverUiP12ivInteractorP7ivTGlue" "ivTSolver::AddAlignment(unsigned int, ivInteractor *, ivTGlue *)"
+    test_demangling "gnu: Append__15NameChooserViewPCc" \
 	"NameChooserView::Append\[(\]+(const char|char const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle ArrowheadIntersects__9ArrowLineP9ArrowheadR6BoxObjP7Graphic" "ArrowLine::ArrowheadIntersects(Arrowhead *, BoxObj &, Graphic *)"
-    gdb_test_exact "maint demangle AtEnd__13ivRubberGroup" "ivRubberGroup::AtEnd(void)"
-    gdb_test_exact "maint demangle BgFilter__9ivTSolverP12ivInteractor" "ivTSolver::BgFilter(ivInteractor *)"
-    gdb_test "maint dem BitPatterntoa__FRC10BitPatternccc" \
+    test_demangling_exact "gnu: ArrowheadIntersects__9ArrowLineP9ArrowheadR6BoxObjP7Graphic" "ArrowLine::ArrowheadIntersects(Arrowhead *, BoxObj &, Graphic *)"
+    test_demangling_exact "gnu: AtEnd__13ivRubberGroup" "ivRubberGroup::AtEnd(void)"
+    test_demangling_exact "gnu: BgFilter__9ivTSolverP12ivInteractor" "ivTSolver::BgFilter(ivInteractor *)"
+    test_demangling "gnu: BitPatterntoa__FRC10BitPatternccc" \
 	"BitPatterntoa\[(\]+(const BitPattern|BitPattern const) &, char, char, char\[)\]+"
-    gdb_test_exact "maint demangle Check__6UArrayi" "UArray::Check(int)"
-    gdb_test_exact "maint demangle CoreConstDecls__8TextCodeR7ostream" "TextCode::CoreConstDecls(ostream &)"
-    gdb_test_exact "maint demangle Detach__8StateVarP12StateVarView" "StateVar::Detach(StateVarView *)"
-    gdb_test_exact "maint demangle Done__9ComponentG8Iterator" "Component::Done(Iterator)"
-    gdb_test "maint dem DrawDestinationTransformedImage__FP7_XImageiiT0iiUlUiiiUiUlUlP4_XGCRC13ivTransformeriiii" \
+    test_demangling_exact "gnu: Check__6UArrayi" "UArray::Check(int)"
+    test_demangling_exact "gnu: CoreConstDecls__8TextCodeR7ostream" "TextCode::CoreConstDecls(ostream &)"
+    test_demangling_exact "gnu: Detach__8StateVarP12StateVarView" "StateVar::Detach(StateVarView *)"
+    test_demangling_exact "gnu: Done__9ComponentG8Iterator" "Component::Done(Iterator)"
+    test_demangling "gnu: DrawDestinationTransformedImage__FP7_XImageiiT0iiUlUiiiUiUlUlP4_XGCRC13ivTransformeriiii" \
 	"DrawDestinationTransformedImage\[(\]+_XImage \[*\]+, int, int, _XImage \[*\]+, int, int, unsigned long, unsigned int, int, int, unsigned int, unsigned long, unsigned long, _XGC \[*\]+, (const ivTransformer|ivTransformer const) &, int, int, int, int\[)\]+"
 
-    gdb_test "maint dem Edit__12StringEditorPCcii" \
+    test_demangling "gnu: Edit__12StringEditorPCcii" \
 	"StringEditor::Edit\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    gdb_test_exact "maint demangle Effect__11RelateManipR7ivEvent" "RelateManip::Effect(ivEvent &)"
-    gdb_test "maint dem FilterName__FPCc" \
+    test_demangling_exact "gnu: Effect__11RelateManipR7ivEvent" "RelateManip::Effect(ivEvent &)"
+    test_demangling "gnu: FilterName__FPCc" \
 	"FilterName\[(\]+(const char|char const) \[*\]+\[)\]+"
-    gdb_test "maint dem Filter__6PSTextPCci" \
+    test_demangling "gnu: Filter__6PSTextPCci" \
 	"PSText::Filter\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    gdb_test "maint dem FindColor__7CatalogPCciii" \
+    test_demangling "gnu: FindColor__7CatalogPCciii" \
 	"Catalog::FindColor\[(\]+(const char|char const) \[*\]+, int, int, int\[)\]+"
-    gdb_test_exact "maint demangle FindFixed__FRP4CNetP4CNet" "FindFixed(CNet *&, CNet *)"
-    gdb_test "maint dem FindFont__7CatalogPCcN21" \
+    test_demangling_exact "gnu: FindFixed__FRP4CNetP4CNet" "FindFixed(CNet *&, CNet *)"
+    test_demangling "gnu: FindFont__7CatalogPCcN21" \
 	"Catalog::FindFont\[(\]+(const char|char const) \[*\]+, (const char|char const) \[*\]+, (const char|char const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle Fix48_abort__FR8twolongs" "Fix48_abort(twolongs &)"
-    gdb_test_exact "maint demangle GetBarInfo__15iv2_6_VScrollerP13ivPerspectiveRiT2" "iv2_6_VScroller::GetBarInfo(ivPerspective *, int &, int &)"
-    gdb_test_exact "maint demangle GetBgColor__C9ivPainter" "ivPainter::GetBgColor(void) const"
+    test_demangling_exact "gnu: Fix48_abort__FR8twolongs" "Fix48_abort(twolongs &)"
+    test_demangling_exact "gnu: GetBarInfo__15iv2_6_VScrollerP13ivPerspectiveRiT2" "iv2_6_VScroller::GetBarInfo(ivPerspective *, int &, int &)"
+    test_demangling_exact "gnu: GetBgColor__C9ivPainter" "ivPainter::GetBgColor(void) const"
 
-    gdb_test "maint dem Iisdouble__FPC6IntRep" \
+    test_demangling "gnu: Iisdouble__FPC6IntRep" \
 	"Iisdouble\[(\]+(const IntRep|IntRep const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle InsertBody__15H_PullrightMenuii" "H_PullrightMenu::InsertBody(int, int)"
-    gdb_test_exact "maint demangle InsertCharacter__9TextManipc" "TextManip::InsertCharacter(char)"
+    test_demangling_exact "gnu: InsertBody__15H_PullrightMenuii" "H_PullrightMenu::InsertBody(int, int)"
+    test_demangling_exact "gnu: InsertCharacter__9TextManipc" "TextManip::InsertCharacter(char)"
 
-    gdb_test_exact "maint demangle InsertToplevel__7ivWorldP12ivInteractorT1" "ivWorld::InsertToplevel(ivInteractor *, ivInteractor *)"
-    gdb_test_exact "maint demangle InsertToplevel__7ivWorldP12ivInteractorT1iiUi" "ivWorld::InsertToplevel(ivInteractor *, ivInteractor *, int, int, unsigned int)"
-    gdb_test "maint dem IsADirectory__FPCcR4stat" \
+    test_demangling_exact "gnu: InsertToplevel__7ivWorldP12ivInteractorT1" "ivWorld::InsertToplevel(ivInteractor *, ivInteractor *)"
+    test_demangling_exact "gnu: InsertToplevel__7ivWorldP12ivInteractorT1iiUi" "ivWorld::InsertToplevel(ivInteractor *, ivInteractor *, int, int, unsigned int)"
+    test_demangling "gnu: IsADirectory__FPCcR4stat" \
 	"IsADirectory\[(\]+(const char|char const) \[*\]+, stat &\[)\]+"
-    gdb_test_exact "maint demangle IsAGroup__FP11GraphicViewP11GraphicComp" "IsAGroup(GraphicView *, GraphicComp *)"
-    gdb_test_exact "maint demangle IsA__10ButtonCodeUl" "ButtonCode::IsA(unsigned long)"
-
-    gdb_test_exact "maint demangle ReadName__FR7istreamPc" "ReadName(istream &, char *)"
-    gdb_test_exact "maint demangle Redraw__13StringBrowseriiii" "StringBrowser::Redraw(int, int, int, int)"
-    gdb_test_exact "maint demangle Rotate__13ivTransformerf" "ivTransformer::Rotate(float)"
-    gdb_test_exact "maint demangle Rotated__C13ivTransformerf" "ivTransformer::Rotated(float) const"
-    gdb_test_exact "maint demangle Round__Ff" "Round(float)"
-
-    gdb_test_exact "maint demangle SetExport__16MemberSharedNameUi" "MemberSharedName::SetExport(unsigned int)"
-    gdb_test_exact "maint demangle Set__14ivControlState13ControlStatusUi" "ivControlState::Set(ControlStatus, unsigned int)"
-    gdb_test_exact "maint demangle Set__5DFacePcii" "DFace::Set(char *, int, int)"
-
-    gdb_test_exact "maint demangle VConvert__9ivTSolverP12ivInteractorRP8TElementT2" "ivTSolver::VConvert(ivInteractor *, TElement *&, TElement *&)"
-    gdb_test_exact "maint demangle VConvert__9ivTSolverP7ivTGlueRP8TElement" "ivTSolver::VConvert(ivTGlue *, TElement *&)"
-    gdb_test_exact "maint demangle VOrder__9ivTSolverUiRP12ivInteractorT2" "ivTSolver::VOrder(unsigned int, ivInteractor *&, ivInteractor *&)"
-    gdb_test "maint dem Valid__7CatalogPCcRP4Tool" \
+    test_demangling_exact "gnu: IsAGroup__FP11GraphicViewP11GraphicComp" "IsAGroup(GraphicView *, GraphicComp *)"
+    test_demangling_exact "gnu: IsA__10ButtonCodeUl" "ButtonCode::IsA(unsigned long)"
+
+    test_demangling_exact "gnu: ReadName__FR7istreamPc" "ReadName(istream &, char *)"
+    test_demangling_exact "gnu: Redraw__13StringBrowseriiii" "StringBrowser::Redraw(int, int, int, int)"
+    test_demangling_exact "gnu: Rotate__13ivTransformerf" "ivTransformer::Rotate(float)"
+    test_demangling_exact "gnu: Rotated__C13ivTransformerf" "ivTransformer::Rotated(float) const"
+    test_demangling_exact "gnu: Round__Ff" "Round(float)"
+
+    test_demangling_exact "gnu: SetExport__16MemberSharedNameUi" "MemberSharedName::SetExport(unsigned int)"
+    test_demangling_exact "gnu: Set__14ivControlState13ControlStatusUi" "ivControlState::Set(ControlStatus, unsigned int)"
+    test_demangling_exact "gnu: Set__5DFacePcii" "DFace::Set(char *, int, int)"
+
+    test_demangling_exact "gnu: VConvert__9ivTSolverP12ivInteractorRP8TElementT2" "ivTSolver::VConvert(ivInteractor *, TElement *&, TElement *&)"
+    test_demangling_exact "gnu: VConvert__9ivTSolverP7ivTGlueRP8TElement" "ivTSolver::VConvert(ivTGlue *, TElement *&)"
+    test_demangling_exact "gnu: VOrder__9ivTSolverUiRP12ivInteractorT2" "ivTSolver::VOrder(unsigned int, ivInteractor *&, ivInteractor *&)"
+    test_demangling "gnu: Valid__7CatalogPCcRP4Tool" \
 	"Catalog::Valid\[(\]+(const char|char const) \[*\]+, Tool \[*\]+&\[)\]+"
-    gdb_test_exact "maint demangle _10PageButton\$__both" "PageButton::__both"
-    gdb_test_exact "maint demangle _3RNG\$singleMantissa" "RNG::singleMantissa"
-    gdb_test_exact "maint demangle _5IComp\$_release" "IComp::_release"
-    gdb_test_exact "maint demangle _\$_10BitmapComp" "BitmapComp::~BitmapComp(void)"
-
-    gdb_test_exact "maint demangle _\$_9__io_defs" "__io_defs::~__io_defs(void)"
-    gdb_test_exact "maint demangle _\$_Q23foo3bar" "foo::bar::~bar(void)"
-    gdb_test_exact "maint demangle _\$_Q33foo3bar4bell" "foo::bar::bell::~bell(void)"
-    gdb_test_exact "maint demangle __10ivTelltaleiP7ivGlyph" "ivTelltale::ivTelltale(int, ivGlyph *)"
-    gdb_test_exact "maint demangle __10ivViewportiP12ivInteractorUi" "ivViewport::ivViewport(int, ivInteractor *, unsigned int)"
-    gdb_test_exact "maint demangle __10ostrstream" "ostrstream::ostrstream(void)"
-    gdb_test_exact "maint demangle __10ostrstreamPcii" "ostrstream::ostrstream(char *, int, int)"
-    gdb_test "maint dem __11BasicDialogiPCcP13ivButtonStateN22Ui" \
+    test_demangling_exact "gnu: _10PageButton\$__both" "PageButton::__both"
+    test_demangling_exact "gnu: _3RNG\$singleMantissa" "RNG::singleMantissa"
+    test_demangling_exact "gnu: _5IComp\$_release" "IComp::_release"
+    test_demangling_exact "gnu: _\$_10BitmapComp" "BitmapComp::~BitmapComp(void)"
+
+    test_demangling_exact "gnu: _\$_9__io_defs" "__io_defs::~__io_defs(void)"
+    test_demangling_exact "gnu: _\$_Q23foo3bar" "foo::bar::~bar(void)"
+    test_demangling_exact "gnu: _\$_Q33foo3bar4bell" "foo::bar::bell::~bell(void)"
+    test_demangling_exact "gnu: __10ivTelltaleiP7ivGlyph" "ivTelltale::ivTelltale(int, ivGlyph *)"
+    test_demangling_exact "gnu: __10ivViewportiP12ivInteractorUi" "ivViewport::ivViewport(int, ivInteractor *, unsigned int)"
+    test_demangling_exact "gnu: __10ostrstream" "ostrstream::ostrstream(void)"
+    test_demangling_exact "gnu: __10ostrstreamPcii" "ostrstream::ostrstream(char *, int, int)"
+    test_demangling "gnu: __11BasicDialogiPCcP13ivButtonStateN22Ui" \
 	"BasicDialog::BasicDialog\[(\]+int, (const char|char const) \[*\]+, ivButtonState \[*\]+, (const char|char const) \[*\]+, (const char|char const) \[*\]+, unsigned int\[)\]+"
-    gdb_test_exact "maint demangle __11BitmapTablei" "BitmapTable::BitmapTable(int)"
-    gdb_test_exact "maint demangle __12ViewportCodeP12ViewportComp" "ViewportCode::ViewportCode(ViewportComp *)"
-    gdb_test "maint dem __12iv2_6_BorderiPCci" \
+    test_demangling_exact "gnu: __11BitmapTablei" "BitmapTable::BitmapTable(int)"
+    test_demangling_exact "gnu: __12ViewportCodeP12ViewportComp" "ViewportCode::ViewportCode(ViewportComp *)"
+    test_demangling "gnu: __12iv2_6_BorderiPCci" \
 	"iv2_6_Border::iv2_6_Border\[(\]+int, (const char|char const) \[*\]+, int\[)\]+"
-    gdb_test_exact "maint demangle __12iv2_6_Borderii" "iv2_6_Border::iv2_6_Border(int, int)"
-    gdb_test "maint dem __12ivBackgroundiP7ivGlyphPC7ivColor" \
+    test_demangling_exact "gnu: __12iv2_6_Borderii" "iv2_6_Border::iv2_6_Border(int, int)"
+    test_demangling "gnu: __12ivBackgroundiP7ivGlyphPC7ivColor" \
 	"ivBackground::ivBackground\[(\]+int, ivGlyph \[*\]+, (const ivColor|ivColor const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle __12ivBreak_Listl" "ivBreak_List::ivBreak_List(long)"
-    gdb_test "maint dem __14TextInteractoriPCcUi" \
+    test_demangling_exact "gnu: __12ivBreak_Listl" "ivBreak_List::ivBreak_List(long)"
+    test_demangling "gnu: __14TextInteractoriPCcUi" \
 	"TextInteractor::TextInteractor\[(\]+int, (const char|char const) \[*\]+, unsigned int\[)\]+"
-    gdb_test_exact "maint demangle __14iv2_6_MenuItemiP12ivInteractor" "iv2_6_MenuItem::iv2_6_MenuItem(int, ivInteractor *)"
-    gdb_test "maint dem __14iv2_6_MenuItemiPCcP12ivInteractor" \
+    test_demangling_exact "gnu: __14iv2_6_MenuItemiP12ivInteractor" "iv2_6_MenuItem::iv2_6_MenuItem(int, ivInteractor *)"
+    test_demangling "gnu: __14iv2_6_MenuItemiPCcP12ivInteractor" \
 	"iv2_6_MenuItem::iv2_6_MenuItem\[(\]+int, (const char|char const) \[*\]+, ivInteractor \[*\]+\[)\]+"
 
-    gdb_test_exact "maint demangle __20DisplayList_IteratorR11DisplayList" "DisplayList_Iterator::DisplayList_Iterator(DisplayList &)"
-    gdb_test_exact "maint demangle __3fooRT0" "foo::foo(foo &)"
-    gdb_test_exact "maint demangle __3fooiN31" "foo::foo(int, int, int, int)"
-    gdb_test "maint dem __3fooiPCc" \
+    test_demangling_exact "gnu: __20DisplayList_IteratorR11DisplayList" "DisplayList_Iterator::DisplayList_Iterator(DisplayList &)"
+    test_demangling_exact "gnu: __3fooRT0" "foo::foo(foo &)"
+    test_demangling_exact "gnu: __3fooiN31" "foo::foo(int, int, int, int)"
+    test_demangling "gnu: __3fooiPCc" \
 	"foo::foo\[(\]+int, (const char|char const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle __3fooiRT0iT2iT2" "foo::foo(int, foo &, int, foo &, int, foo &)"
-    gdb_test "maint dem __6GetOptiPPcPCc" \
+    test_demangling_exact "gnu: __3fooiRT0iT2iT2" "foo::foo(int, foo &, int, foo &, int, foo &)"
+    test_demangling "gnu: __6GetOptiPPcPCc" \
 	"GetOpt::GetOpt\[(\]+int, char \[*\]+\[*\]+, (const char|char const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle __6KeyMapPT0" "KeyMap::KeyMap(KeyMap *)"
-    gdb_test "maint dem __7ivWorldPCcRiPPcPC12ivOptionDescPC14ivPropertyData" \
+    test_demangling_exact "gnu: __6KeyMapPT0" "KeyMap::KeyMap(KeyMap *)"
+    test_demangling "gnu: __7ivWorldPCcRiPPcPC12ivOptionDescPC14ivPropertyData" \
 	"ivWorld::ivWorld\[(\]+(const char|char const) \[*\]+, int &, char \[*\]+\[*\]+, (const ivOptionDesc|ivOptionDesc const) \[*\]+, (const ivPropertyData|ivPropertyData const) \[*\]+\[)\]+"
-    gdb_test "maint dem __7procbufPCci" \
+    test_demangling "gnu: __7procbufPCci" \
 	"procbuf::procbuf\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    gdb_test_exact "maint demangle __8ArrowCmdP6EditorUiUi" "ArrowCmd::ArrowCmd(Editor *, unsigned int, unsigned int)"
-
-    gdb_test_exact "maint demangle __9F_EllipseiiiiP7Graphic" "F_Ellipse::F_Ellipse(int, int, int, int, Graphic *)"
-    gdb_test_exact "maint demangle __9FrameDataP9FrameCompi" "FrameData::FrameData(FrameComp *, int)"
-    gdb_test_exact "maint demangle __9HVGraphicP9CanvasVarP7Graphic" "HVGraphic::HVGraphic(CanvasVar *, Graphic *)"
-    gdb_test_exact "maint demangle __Q23foo3bar" "foo::bar::bar(void)"
-    gdb_test_exact "maint demangle __Q33foo3bar4bell" "foo::bar::bell::bell(void)"
-    gdb_test_exact "maint demangle __aa__3fooRT0" "foo::operator&&(foo &)"
-    gdb_test_exact "maint demangle __aad__3fooRT0" "foo::operator&=(foo &)"
-    gdb_test_exact "maint demangle __ad__3fooRT0" "foo::operator&(foo &)"
-    gdb_test_exact "maint demangle __adv__3fooRT0" "foo::operator/=(foo &)"
-    gdb_test_exact "maint demangle __aer__3fooRT0" "foo::operator^=(foo &)"
-    gdb_test_exact "maint demangle __als__3fooRT0" "foo::operator<<=(foo &)"
-    gdb_test_exact "maint demangle __amd__3fooRT0" "foo::operator%=(foo &)"
-    gdb_test_exact "maint demangle __ami__3fooRT0" "foo::operator-=(foo &)"
-    gdb_test_exact "maint demangle __aml__3FixRT0" "Fix::operator*=(Fix &)"
-    gdb_test_exact "maint demangle __aml__5Fix16i" "Fix16::operator*=(int)"
-    gdb_test_exact "maint demangle __aml__5Fix32RT0" "Fix32::operator*=(Fix32 &)"
-    gdb_test_exact "maint demangle __aor__3fooRT0" "foo::operator|=(foo &)"
-    gdb_test_exact "maint demangle __apl__3fooRT0" "foo::operator+=(foo &)"
-    gdb_test_exact "maint demangle __ars__3fooRT0" "foo::operator>>=(foo &)"
-
-    gdb_test_exact "maint demangle __as__3fooRT0" "foo::operator=(foo &)"
-    gdb_test_exact "maint demangle __cl__3fooRT0" "foo::operator()(foo &)"
-    gdb_test_exact "maint demangle __cl__6Normal" "Normal::operator()(void)"
-    gdb_test_exact "maint demangle __cl__6Stringii" "String::operator()(int, int)"
-    gdb_test_exact "maint demangle __cm__3fooRT0" "foo::operator, (foo &)"
-    gdb_test_exact "maint demangle __co__3foo" "foo::operator~(void)"
-    gdb_test_exact "maint demangle __dl__3fooPv" "foo::operator delete(void *)"
-    gdb_test_exact "maint demangle __dv__3fooRT0" "foo::operator/(foo &)"
-    gdb_test_exact "maint demangle __eq__3fooRT0" "foo::operator==(foo &)"
-    gdb_test_exact "maint demangle __er__3fooRT0" "foo::operator^(foo &)"
-    gdb_test_exact "maint demangle __ge__3fooRT0" "foo::operator>=(foo &)"
-    gdb_test_exact "maint demangle __gt__3fooRT0" "foo::operator>(foo &)"
-    gdb_test_exact "maint demangle __le__3fooRT0" "foo::operator<=(foo &)"
-    gdb_test_exact "maint demangle __ls__3fooRT0" "foo::operator<<(foo &)"
-    gdb_test_exact "maint demangle __ls__FR7ostreamPFR3ios_R3ios" "operator<<(ostream &, ios &(*)(ios &))"
-    gdb_test_exact "maint demangle __ls__FR7ostreamR3Fix" "operator<<(ostream &, Fix &)"
-    gdb_test_exact "maint demangle __lt__3fooRT0" "foo::operator<(foo &)"
-    gdb_test_exact "maint demangle __md__3fooRT0" "foo::operator%(foo &)"
-    gdb_test_exact "maint demangle __mi__3fooRT0" "foo::operator-(foo &)"
-    gdb_test_exact "maint demangle __ml__3fooRT0" "foo::operator*(foo &)"
-    gdb_test_exact "maint demangle __mm__3fooi" "foo::operator--(int)"
-
-    gdb_test_exact "maint demangle __ne__3fooRT0" "foo::operator!=(foo &)"
-    gdb_test "maint dem __ne__FRC7ComplexT0" \
+    test_demangling_exact "gnu: __8ArrowCmdP6EditorUiUi" "ArrowCmd::ArrowCmd(Editor *, unsigned int, unsigned int)"
+
+    test_demangling_exact "gnu: __9F_EllipseiiiiP7Graphic" "F_Ellipse::F_Ellipse(int, int, int, int, Graphic *)"
+    test_demangling_exact "gnu: __9FrameDataP9FrameCompi" "FrameData::FrameData(FrameComp *, int)"
+    test_demangling_exact "gnu: __9HVGraphicP9CanvasVarP7Graphic" "HVGraphic::HVGraphic(CanvasVar *, Graphic *)"
+    test_demangling_exact "gnu: __Q23foo3bar" "foo::bar::bar(void)"
+    test_demangling_exact "gnu: __Q33foo3bar4bell" "foo::bar::bell::bell(void)"
+    test_demangling_exact "gnu: __aa__3fooRT0" "foo::operator&&(foo &)"
+    test_demangling_exact "gnu: __aad__3fooRT0" "foo::operator&=(foo &)"
+    test_demangling_exact "gnu: __ad__3fooRT0" "foo::operator&(foo &)"
+    test_demangling_exact "gnu: __adv__3fooRT0" "foo::operator/=(foo &)"
+    test_demangling_exact "gnu: __aer__3fooRT0" "foo::operator^=(foo &)"
+    test_demangling_exact "gnu: __als__3fooRT0" "foo::operator<<=(foo &)"
+    test_demangling_exact "gnu: __amd__3fooRT0" "foo::operator%=(foo &)"
+    test_demangling_exact "gnu: __ami__3fooRT0" "foo::operator-=(foo &)"
+    test_demangling_exact "gnu: __aml__3FixRT0" "Fix::operator*=(Fix &)"
+    test_demangling_exact "gnu: __aml__5Fix16i" "Fix16::operator*=(int)"
+    test_demangling_exact "gnu: __aml__5Fix32RT0" "Fix32::operator*=(Fix32 &)"
+    test_demangling_exact "gnu: __aor__3fooRT0" "foo::operator|=(foo &)"
+    test_demangling_exact "gnu: __apl__3fooRT0" "foo::operator+=(foo &)"
+    test_demangling_exact "gnu: __ars__3fooRT0" "foo::operator>>=(foo &)"
+
+    test_demangling_exact "gnu: __as__3fooRT0" "foo::operator=(foo &)"
+    test_demangling_exact "gnu: __cl__3fooRT0" "foo::operator()(foo &)"
+    test_demangling_exact "gnu: __cl__6Normal" "Normal::operator()(void)"
+    test_demangling_exact "gnu: __cl__6Stringii" "String::operator()(int, int)"
+    test_demangling_exact "gnu: __cm__3fooRT0" "foo::operator, (foo &)"
+    test_demangling_exact "gnu: __co__3foo" "foo::operator~(void)"
+    test_demangling_exact "gnu: __dl__3fooPv" "foo::operator delete(void *)"
+    test_demangling_exact "gnu: __dv__3fooRT0" "foo::operator/(foo &)"
+    test_demangling_exact "gnu: __eq__3fooRT0" "foo::operator==(foo &)"
+    test_demangling_exact "gnu: __er__3fooRT0" "foo::operator^(foo &)"
+    test_demangling_exact "gnu: __ge__3fooRT0" "foo::operator>=(foo &)"
+    test_demangling_exact "gnu: __gt__3fooRT0" "foo::operator>(foo &)"
+    test_demangling_exact "gnu: __le__3fooRT0" "foo::operator<=(foo &)"
+    test_demangling_exact "gnu: __ls__3fooRT0" "foo::operator<<(foo &)"
+    test_demangling_exact "gnu: __ls__FR7ostreamPFR3ios_R3ios" "operator<<(ostream &, ios &(*)(ios &))"
+    test_demangling_exact "gnu: __ls__FR7ostreamR3Fix" "operator<<(ostream &, Fix &)"
+    test_demangling_exact "gnu: __lt__3fooRT0" "foo::operator<(foo &)"
+    test_demangling_exact "gnu: __md__3fooRT0" "foo::operator%(foo &)"
+    test_demangling_exact "gnu: __mi__3fooRT0" "foo::operator-(foo &)"
+    test_demangling_exact "gnu: __ml__3fooRT0" "foo::operator*(foo &)"
+    test_demangling_exact "gnu: __mm__3fooi" "foo::operator--(int)"
+
+    test_demangling_exact "gnu: __ne__3fooRT0" "foo::operator!=(foo &)"
+    test_demangling "gnu: __ne__FRC7ComplexT0" \
 	"operator!=\[(\]+(const Complex|Complex const) &, (const Complex|Complex const) &\[)\]+"
-    gdb_test "maint dem __ne__FRC7Complexd" \
+    test_demangling "gnu: __ne__FRC7Complexd" \
 	"operator!=\[(\]+(const Complex|Complex const) &, double\[)\]+"
-    gdb_test "maint dem __ne__FRC9SubStringRC6String" \
+    test_demangling "gnu: __ne__FRC9SubStringRC6String" \
 	"operator!=\[(\]+(const SubString|SubString const) &, (const String|String const) &\[)\]+"
-    gdb_test_exact "maint demangle __nt__3foo" "foo::operator!(void)"
-    gdb_test_exact "maint demangle __nw__3fooi" "foo::operator new(int)"
-    gdb_test_exact "maint demangle __oo__3fooRT0" "foo::operator||(foo &)"
-    gdb_test_exact "maint demangle __opPc__3foo" "foo::operator char *(void)"
-    gdb_test_exact "maint demangle __opi__3foo" "foo::operator int(void)"
-    gdb_test_exact "maint demangle __or__3fooRT0" "foo::operator|(foo &)"
-    gdb_test_exact "maint demangle __pl__3fooRT0" "foo::operator+(foo &)"
-    gdb_test_exact "maint demangle __pp__3fooi" "foo::operator++(int)"
-    gdb_test_exact "maint demangle __rf__3foo" "foo::operator->(void)"
-    gdb_test_exact "maint demangle __rm__3fooRT0" "foo::operator->*(foo &)"
-    gdb_test_exact "maint demangle __rs__3fooRT0" "foo::operator>>(foo &)"
-    gdb_test "maint dem __vc__3fooRT0" "foo::operator\\\[\\\]\\(foo &\\)"
-    gdb_test "maint dem _gsub__6StringRC5RegexPCci" \
+    test_demangling_exact "gnu: __nt__3foo" "foo::operator!(void)"
+    test_demangling_exact "gnu: __nw__3fooi" "foo::operator new(int)"
+    test_demangling_exact "gnu: __oo__3fooRT0" "foo::operator||(foo &)"
+    test_demangling_exact "gnu: __opPc__3foo" "foo::operator char *(void)"
+    test_demangling_exact "gnu: __opi__3foo" "foo::operator int(void)"
+    test_demangling_exact "gnu: __or__3fooRT0" "foo::operator|(foo &)"
+    test_demangling_exact "gnu: __pl__3fooRT0" "foo::operator+(foo &)"
+    test_demangling_exact "gnu: __pp__3fooi" "foo::operator++(int)"
+    test_demangling_exact "gnu: __rf__3foo" "foo::operator->(void)"
+    test_demangling_exact "gnu: __rm__3fooRT0" "foo::operator->*(foo &)"
+    test_demangling_exact "gnu: __rs__3fooRT0" "foo::operator>>(foo &)"
+    test_demangling "gnu: __vc__3fooRT0" "foo::operator\\\[\\\]\\(foo &\\)"
+    test_demangling "gnu: _gsub__6StringRC5RegexPCci" \
 	"String::_gsub\[(\]+(const Regex|Regex const) &, (const char|char const) \[*\]+, int\[)\]+"
-    gdb_test_exact "maint demangle _new_Fix__FUs" "_new_Fix(unsigned short)"
+    test_demangling_exact "gnu: _new_Fix__FUs" "_new_Fix(unsigned short)"
 
     # gcc 2.4.5 (and earlier) style virtual tables.  We want to continue to
     # correctly demangle these even if newer compilers use a different form.
-    gdb_test_exact "maint demangle _vt.foo" "foo virtual table"
-    gdb_test_exact "maint demangle _vt.foo.bar" "foo::bar virtual table"
-    gdb_test_exact "maint demangle _vt\$foo" "foo virtual table"
-    gdb_test_exact "maint demangle _vt\$foo\$bar" "foo::bar virtual table"
+    test_demangling_exact "gnu: _vt.foo" "foo virtual table"
+    test_demangling_exact "gnu: _vt.foo.bar" "foo::bar virtual table"
+    test_demangling_exact "gnu: _vt\$foo" "foo virtual table"
+    test_demangling_exact "gnu: _vt\$foo\$bar" "foo::bar virtual table"
 
-    gdb_test_exact "maint demangle append__7ivGlyphPT0" "ivGlyph::append(ivGlyph *)"
-    gdb_test "maint dem arg__FRC7Complex" \
+    test_demangling_exact "gnu: append__7ivGlyphPT0" "ivGlyph::append(ivGlyph *)"
+    test_demangling "gnu: arg__FRC7Complex" \
 	"arg\[(\]+(const Complex|Complex const) &\[)\]+"
-    gdb_test_exact "maint demangle clearok__FP7_win_sti" "clearok(_win_st *, int)"
-
-    gdb_test_exact "maint demangle complexfunc2__FPFPc_i" "complexfunc2(int (*)(char *))"
-    gdb_test_exact "maint demangle complexfunc3__FPFPFPl_s_i" "complexfunc3(int (*)(short (*)(long *)))"
-    gdb_test_exact "maint demangle complexfunc4__FPFPFPc_s_i" "complexfunc4(int (*)(short (*)(char *)))"
-    gdb_test_exact "maint demangle complexfunc5__FPFPc_PFl_i" "complexfunc5(int (*(*)(char *))(long))"
-    gdb_test_exact "maint demangle complexfunc6__FPFPi_PFl_i" "complexfunc6(int (*(*)(int *))(long))"
-    gdb_test_exact "maint demangle complexfunc7__FPFPFPc_i_PFl_i" "complexfunc7(int (*(*)(int (*)(char *)))(long))"
-    gdb_test "maint dem contains__C9BitStringRC10BitPattern" \
+    test_demangling_exact "gnu: clearok__FP7_win_sti" "clearok(_win_st *, int)"
+
+    test_demangling_exact "gnu: complexfunc2__FPFPc_i" "complexfunc2(int (*)(char *))"
+    test_demangling_exact "gnu: complexfunc3__FPFPFPl_s_i" "complexfunc3(int (*)(short (*)(long *)))"
+    test_demangling_exact "gnu: complexfunc4__FPFPFPc_s_i" "complexfunc4(int (*)(short (*)(char *)))"
+    test_demangling_exact "gnu: complexfunc5__FPFPc_PFl_i" "complexfunc5(int (*(*)(char *))(long))"
+    test_demangling_exact "gnu: complexfunc6__FPFPi_PFl_i" "complexfunc6(int (*(*)(int *))(long))"
+    test_demangling_exact "gnu: complexfunc7__FPFPFPc_i_PFl_i" "complexfunc7(int (*(*)(int (*)(char *)))(long))"
+    test_demangling "gnu: contains__C9BitStringRC10BitPattern" \
 	"BitString::contains\[(\]+(const BitPattern|BitPattern const) &\[)\]+ const"
-    gdb_test "maint dem contains__C9BitStringRC12BitSubStringi" \
+    test_demangling "gnu: contains__C9BitStringRC12BitSubStringi" \
 	"BitString::contains\[(\]+(const BitSubString|BitSubString const) &, int\[)\]+ const"
-    gdb_test "maint dem contains__C9BitStringRT0" \
+    test_demangling "gnu: contains__C9BitStringRT0" \
 	"BitString::contains\[(\]+(const BitString|BitString const) &\[)\]+ const"
-    gdb_test "maint dem div__FPC6IntRepT0P6IntRep" \
+    test_demangling "gnu: div__FPC6IntRepT0P6IntRep" \
 	"div\[(\]+(const IntRep|IntRep const) \[*\]+, (const IntRep|IntRep const) \[*\]+, IntRep \[*\]+\[)\]+"
-    gdb_test "maint dem div__FPC6IntReplP6IntRep" \
+    test_demangling "gnu: div__FPC6IntReplP6IntRep" \
 	"div\[(\]+(const IntRep|IntRep const) \[*\]+, long, IntRep \[*\]+\[)\]+"
-    gdb_test "maint dem div__FRC8RationalT0R8Rational" \
+    test_demangling "gnu: div__FRC8RationalT0R8Rational" \
 	"div\[(\]+(const Rational|Rational const) &, (const Rational|Rational const) &, Rational &\[)\]+"
-    gdb_test "maint dem divide__FRC7IntegerT0R7IntegerT2" \
+    test_demangling "gnu: divide__FRC7IntegerT0R7IntegerT2" \
 	"divide\[(\]+(const Integer|Integer const) &, (const Integer|Integer const) &, Integer &, Integer &\[)\]+"
-    gdb_test "maint dem divide__FRC7IntegerlR7IntegerRl" \
+    test_demangling "gnu: divide__FRC7IntegerlR7IntegerRl" \
 	"divide\[(\]+(const Integer|Integer const) &, long, Integer &, long &\[)\]+"
-    gdb_test "maint dem enable__14DocumentViewerPCcUi" \
+    test_demangling "gnu: enable__14DocumentViewerPCcUi" \
 	"DocumentViewer::enable\[(\]+(const char|char const) \[*\]+, unsigned int\[)\]+"
 
-    gdb_test_exact "maint demangle foo__FiN30" "foo(int, int, int, int)"
-    gdb_test_exact "maint demangle foo__FiR3fooiT1iT1" "foo(int, foo &, int, foo &, int, foo &)"
-    gdb_test_exact "maint demangle foo___3barl" "bar::foo_(long)"
-    gdb_test_exact "maint demangle insert__15ivClippingStacklRP8_XRegion" "ivClippingStack::insert(long, _XRegion *&)"
-    gdb_test_exact "maint demangle insert__16ChooserInfo_ListlR11ChooserInfo" "ChooserInfo_List::insert(long, ChooserInfo &)"
-    gdb_test_exact "maint demangle insert__17FontFamilyRepListlRP15ivFontFamilyRep" "FontFamilyRepList::insert(long, ivFontFamilyRep *&)"
-    gdb_test_exact "maint demangle leaveok__FP7_win_stc" "leaveok(_win_st *, char)"
-    gdb_test_exact "maint demangle left_mover__C7ivMFKitP12ivAdjustableP7ivStyle" "ivMFKit::left_mover(ivAdjustable *, ivStyle *) const"
-    gdb_test "maint dem matches__C9BitStringRC10BitPatterni" \
+    test_demangling_exact "gnu: foo__FiN30" "foo(int, int, int, int)"
+    test_demangling_exact "gnu: foo__FiR3fooiT1iT1" "foo(int, foo &, int, foo &, int, foo &)"
+    test_demangling_exact "gnu: foo___3barl" "bar::foo_(long)"
+    test_demangling_exact "gnu: insert__15ivClippingStacklRP8_XRegion" "ivClippingStack::insert(long, _XRegion *&)"
+    test_demangling_exact "gnu: insert__16ChooserInfo_ListlR11ChooserInfo" "ChooserInfo_List::insert(long, ChooserInfo &)"
+    test_demangling_exact "gnu: insert__17FontFamilyRepListlRP15ivFontFamilyRep" "FontFamilyRepList::insert(long, ivFontFamilyRep *&)"
+    test_demangling_exact "gnu: leaveok__FP7_win_stc" "leaveok(_win_st *, char)"
+    test_demangling_exact "gnu: left_mover__C7ivMFKitP12ivAdjustableP7ivStyle" "ivMFKit::left_mover(ivAdjustable *, ivStyle *) const"
+    test_demangling "gnu: matches__C9BitStringRC10BitPatterni" \
 	"BitString::matches\[(\]+(const BitPattern|BitPattern const) &, int\[)\]+ const"
-    gdb_test "maint dem matches__C9SubStringRC5Regex" \
+    test_demangling "gnu: matches__C9SubStringRC5Regex" \
 	"SubString::matches\[(\]+(const Regex|Regex const) &\[)\]+ const"
 
-    gdb_test_exact "maint demangle overload1arg__FSc" "overload1arg(signed char)"
-    gdb_test_exact "maint demangle overload1arg__FUc" "overload1arg(unsigned char)"
-    gdb_test_exact "maint demangle overload1arg__FUi" "overload1arg(unsigned int)"
-    gdb_test_exact "maint demangle overload1arg__FUl" "overload1arg(unsigned long)"
-    gdb_test_exact "maint demangle overload1arg__FUs" "overload1arg(unsigned short)"
-    gdb_test_exact "maint demangle overload1arg__Fc" "overload1arg(char)"
-    gdb_test_exact "maint demangle overload1arg__Fd" "overload1arg(double)"
-    gdb_test_exact "maint demangle overload1arg__Ff" "overload1arg(float)"
-    gdb_test_exact "maint demangle overload1arg__Fi" "overload1arg(int)"
-    gdb_test_exact "maint demangle overload1arg__Fl" "overload1arg(long)"
-    gdb_test_exact "maint demangle overload1arg__Fs" "overload1arg(short)"
-    gdb_test_exact "maint demangle overload1arg__Fv" "overload1arg(void)"
-    gdb_test_exact "maint demangle overloadargs__Fi" "overloadargs(int)"
-    gdb_test_exact "maint demangle overloadargs__Fii" "overloadargs(int, int)"
-    gdb_test_exact "maint demangle overloadargs__Fiii" "overloadargs(int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__Fiiii" "overloadargs(int, int, int, int)"
-
-    gdb_test_exact "maint demangle overloadargs__Fiiiii" "overloadargs(int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__Fiiiiii" "overloadargs(int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__Fiiiiiii" "overloadargs(int, int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__Fiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__Fiiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__Fiiiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__Fiiiiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int, int, int, int)"
-    gdb_test "maint dem pick__13ivCompositionP8ivCanvasRC12ivAllocationiR5ivHit" \
+    test_demangling_exact "gnu: overload1arg__FSc" "overload1arg(signed char)"
+    test_demangling_exact "gnu: overload1arg__FUc" "overload1arg(unsigned char)"
+    test_demangling_exact "gnu: overload1arg__FUi" "overload1arg(unsigned int)"
+    test_demangling_exact "gnu: overload1arg__FUl" "overload1arg(unsigned long)"
+    test_demangling_exact "gnu: overload1arg__FUs" "overload1arg(unsigned short)"
+    test_demangling_exact "gnu: overload1arg__Fc" "overload1arg(char)"
+    test_demangling_exact "gnu: overload1arg__Fd" "overload1arg(double)"
+    test_demangling_exact "gnu: overload1arg__Ff" "overload1arg(float)"
+    test_demangling_exact "gnu: overload1arg__Fi" "overload1arg(int)"
+    test_demangling_exact "gnu: overload1arg__Fl" "overload1arg(long)"
+    test_demangling_exact "gnu: overload1arg__Fs" "overload1arg(short)"
+    test_demangling_exact "gnu: overload1arg__Fv" "overload1arg(void)"
+    test_demangling_exact "gnu: overloadargs__Fi" "overloadargs(int)"
+    test_demangling_exact "gnu: overloadargs__Fii" "overloadargs(int, int)"
+    test_demangling_exact "gnu: overloadargs__Fiii" "overloadargs(int, int, int)"
+    test_demangling_exact "gnu: overloadargs__Fiiii" "overloadargs(int, int, int, int)"
+
+    test_demangling_exact "gnu: overloadargs__Fiiiii" "overloadargs(int, int, int, int, int)"
+    test_demangling_exact "gnu: overloadargs__Fiiiiii" "overloadargs(int, int, int, int, int, int)"
+    test_demangling_exact "gnu: overloadargs__Fiiiiiii" "overloadargs(int, int, int, int, int, int, int)"
+    test_demangling_exact "gnu: overloadargs__Fiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int)"
+    test_demangling_exact "gnu: overloadargs__Fiiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int, int)"
+    test_demangling_exact "gnu: overloadargs__Fiiiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int, int, int)"
+    test_demangling_exact "gnu: overloadargs__Fiiiiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int, int, int, int)"
+    test_demangling "gnu: pick__13ivCompositionP8ivCanvasRC12ivAllocationiR5ivHit" \
 	"ivComposition::pick\[(\]+ivCanvas \[*\]+, (const ivAllocation|ivAllocation const) &, int, ivHit &\[)\]+"
-    gdb_test "maint dem pointer__C11ivHScrollerRC7ivEventRC12ivAllocation" \
+    test_demangling "gnu: pointer__C11ivHScrollerRC7ivEventRC12ivAllocation" \
 	"ivHScroller::pointer\[(\]+(const ivEvent|ivEvent const) &, (const ivAllocation|ivAllocation const) &\[)\]+ const"
-    gdb_test_exact "maint demangle poke__8ivRasterUlUlffff" "ivRaster::poke(unsigned long, unsigned long, float, float, float, float)"
-    gdb_test_exact "maint demangle polar__Fdd" "polar(double, double)"
-    gdb_test "maint dem read__10osStdInputRPCc" \
+    test_demangling_exact "gnu: poke__8ivRasterUlUlffff" "ivRaster::poke(unsigned long, unsigned long, float, float, float, float)"
+    test_demangling_exact "gnu: polar__Fdd" "polar(double, double)"
+    test_demangling "gnu: read__10osStdInputRPCc" \
 	"osStdInput::read\[(\]+(const char|char const) \[*\]+&\[)\]+"
 
-    gdb_test_exact "maint demangle scale__13ivTransformerff" "ivTransformer::scale(float, float)"
-    gdb_test "maint dem scanw__12CursesWindowPCce" \
+    test_demangling_exact "gnu: scale__13ivTransformerff" "ivTransformer::scale(float, float)"
+    test_demangling "gnu: scanw__12CursesWindowPCce" \
 	"CursesWindow::scanw\[(\]+(const char|char const) \[*\]+,...\[)\]+"
-    gdb_test "maint dem scmp__FPCcT0" \
+    test_demangling "gnu: scmp__FPCcT0" \
 	"scmp\[(\]+(const char|char const) \[*\]+, (const char|char const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle sgetn__7filebufPci" "filebuf::sgetn(char *, int)"
-    gdb_test_exact "maint demangle shift__FP5_FrepiT0" "shift(_Frep *, int, _Frep *)"
-    gdb_test_exact "maint demangle test__C6BitSeti" "BitSet::test(int) const"
-    gdb_test_exact "maint demangle test__C6BitSetii" "BitSet::test(int, int) const"
-    gdb_test "maint dem testbit__FRC7Integerl" \
+    test_demangling_exact "gnu: sgetn__7filebufPci" "filebuf::sgetn(char *, int)"
+    test_demangling_exact "gnu: shift__FP5_FrepiT0" "shift(_Frep *, int, _Frep *)"
+    test_demangling_exact "gnu: test__C6BitSeti" "BitSet::test(int) const"
+    test_demangling_exact "gnu: test__C6BitSetii" "BitSet::test(int, int) const"
+    test_demangling "gnu: testbit__FRC7Integerl" \
 	"testbit\[(\]+(const Integer|Integer const) &, long\[)\]+"
-    gdb_test_exact "maint demangle text_source__8Documentl" "Document::text_source(long)"
-    gdb_test_exact "maint demangle variance__6Erlangd" "Erlang::variance(double)"
-    gdb_test "maint dem vform__8iostreamPCcPc" \
+    test_demangling_exact "gnu: text_source__8Documentl" "Document::text_source(long)"
+    test_demangling_exact "gnu: variance__6Erlangd" "Erlang::variance(double)"
+    test_demangling "gnu: vform__8iostreamPCcPc" \
 	"iostream::vform\[(\]+(const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle view__14DocumentViewerP8ItemViewP11TabularItem" "DocumentViewer::view(ItemView *, TabularItem *)"
-    gdb_test_exact "maint demangle xy_extents__11ivExtensionffff" "ivExtension::xy_extents(float, float, float, float)"
-    gdb_test_exact "maint demangle zero__8osMemoryPvUi" "osMemory::zero(void *, unsigned int)"
-    gdb_test_exact "maint demangle _2T4\$N" "T4::N"
-    gdb_test_exact "maint demangle _Q22T42t1\$N" "T4::t1::N"
-    gdb_test_exact "maint demangle get__2T1" "T1::get(void)"
-    gdb_test_exact "maint demangle get__Q22T11a" "T1::a::get(void)"
-    gdb_test_exact "maint demangle get__Q32T11a1b" "T1::a::b::get(void)"
-    gdb_test_exact "maint demangle get__Q42T11a1b1c" "T1::a::b::c::get(void)"
-    gdb_test_exact "maint demangle get__Q52T11a1b1c1d" "T1::a::b::c::d::get(void)"
-    gdb_test_exact "maint demangle put__2T1i" "T1::put(int)"
-    gdb_test_exact "maint demangle put__Q22T11ai" "T1::a::put(int)"
-    gdb_test_exact "maint demangle put__Q32T11a1bi" "T1::a::b::put(int)"
-    gdb_test_exact "maint demangle put__Q42T11a1b1ci" "T1::a::b::c::put(int)"
-    gdb_test_exact "maint demangle put__Q52T11a1b1c1di" "T1::a::b::c::d::put(int)"
-
-    gdb_test_exact "maint demangle bar__3fooPv"       "foo::bar(void *)"
-    gdb_test "maint dem bar__3fooPCv" \
+    test_demangling_exact "gnu: view__14DocumentViewerP8ItemViewP11TabularItem" "DocumentViewer::view(ItemView *, TabularItem *)"
+    test_demangling_exact "gnu: xy_extents__11ivExtensionffff" "ivExtension::xy_extents(float, float, float, float)"
+    test_demangling_exact "gnu: zero__8osMemoryPvUi" "osMemory::zero(void *, unsigned int)"
+    test_demangling_exact "gnu: _2T4\$N" "T4::N"
+    test_demangling_exact "gnu: _Q22T42t1\$N" "T4::t1::N"
+    test_demangling_exact "gnu: get__2T1" "T1::get(void)"
+    test_demangling_exact "gnu: get__Q22T11a" "T1::a::get(void)"
+    test_demangling_exact "gnu: get__Q32T11a1b" "T1::a::b::get(void)"
+    test_demangling_exact "gnu: get__Q42T11a1b1c" "T1::a::b::c::get(void)"
+    test_demangling_exact "gnu: get__Q52T11a1b1c1d" "T1::a::b::c::d::get(void)"
+    test_demangling_exact "gnu: put__2T1i" "T1::put(int)"
+    test_demangling_exact "gnu: put__Q22T11ai" "T1::a::put(int)"
+    test_demangling_exact "gnu: put__Q32T11a1bi" "T1::a::b::put(int)"
+    test_demangling_exact "gnu: put__Q42T11a1b1ci" "T1::a::b::c::put(int)"
+    test_demangling_exact "gnu: put__Q52T11a1b1c1di" "T1::a::b::c::d::put(int)"
+
+    test_demangling_exact "gnu: bar__3fooPv"       "foo::bar(void *)"
+    test_demangling "gnu: bar__3fooPCv" \
 	"foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+"
-    gdb_test_exact "maint demangle bar__C3fooPv"      "foo::bar(void *) const"
-    gdb_test "maint dem bar__C3fooPCv" \
+    test_demangling_exact "gnu: bar__C3fooPv"      "foo::bar(void *) const"
+    test_demangling "gnu: bar__C3fooPCv" \
 	"foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+ const"
-    gdb_test_exact "maint demangle __eq__3fooRT0"     "foo::operator==(foo &)"
-    gdb_test "maint dem __eq__3fooRC3foo" \
+    test_demangling_exact "gnu: __eq__3fooRT0"     "foo::operator==(foo &)"
+    test_demangling "gnu: __eq__3fooRC3foo" \
 	 "foo::operator==\[(\]+(const foo|foo const) &\[)\]+"
-    gdb_test_exact "maint demangle __eq__C3fooR3foo"  "foo::operator==(foo &) const"
-    gdb_test "maint dem __eq__C3fooRT0" \
+    test_demangling_exact "gnu: __eq__C3fooR3foo"  "foo::operator==(foo &) const"
+    test_demangling "gnu: __eq__C3fooRT0" \
 	   "foo::operator==\[(\]+(const foo|foo const) &\[)\]+ const"
 
-    gdb_test_exact "maint demangle elem__t6vector1Zdi" "vector<double>::elem(int)"
-    gdb_test_exact "maint demangle elem__t6vector1Zii" "vector<int>::elem(int)"
-    gdb_test_exact "maint demangle __t6vector1Zdi"     "vector<double>::vector(int)"
-    gdb_test_exact "maint demangle __t6vector1Zii"     "vector<int>::vector(int)"
-    gdb_test_exact "maint demangle _\$_t6vector1Zdi"    "vector<double>::~vector(int)"
-    gdb_test_exact "maint demangle _\$_t6vector1Zii"    "vector<int>::~vector(int)"
-
-    gdb_test_exact "maint demangle __nw__t2T11ZcUi" "T1<char>::operator new(unsigned int)"
-    gdb_test_exact "maint demangle __nw__t2T11Z1tUi" "T1<t>::operator new(unsigned int)"
-    gdb_test_exact "maint demangle __dl__t2T11ZcPv" "T1<char>::operator delete(void *)"
-    gdb_test_exact "maint demangle __dl__t2T11Z1tPv" "T1<t>::operator delete(void *)"
-    gdb_test_exact "maint demangle __t2T11Zci" "T1<char>::T1(int)"
-    gdb_test_exact "maint demangle __t2T11Zc" "T1<char>::T1(void)"
-    gdb_test_exact "maint demangle __t2T11Z1ti" "T1<t>::T1(int)"
-    gdb_test_exact "maint demangle __t2T11Z1t" "T1<t>::T1(void)"
-
-    gdb_test_exact "maint demangle __Q2t4List1Z10VHDLEntity3Pix" \
+    test_demangling_exact "gnu: elem__t6vector1Zdi" "vector<double>::elem(int)"
+    test_demangling_exact "gnu: elem__t6vector1Zii" "vector<int>::elem(int)"
+    test_demangling_exact "gnu: __t6vector1Zdi"     "vector<double>::vector(int)"
+    test_demangling_exact "gnu: __t6vector1Zii"     "vector<int>::vector(int)"
+    test_demangling_exact "gnu: _\$_t6vector1Zdi"    "vector<double>::~vector(int)"
+    test_demangling_exact "gnu: _\$_t6vector1Zii"    "vector<int>::~vector(int)"
+
+    test_demangling_exact "gnu: __nw__t2T11ZcUi" "T1<char>::operator new(unsigned int)"
+    test_demangling_exact "gnu: __nw__t2T11Z1tUi" "T1<t>::operator new(unsigned int)"
+    test_demangling_exact "gnu: __dl__t2T11ZcPv" "T1<char>::operator delete(void *)"
+    test_demangling_exact "gnu: __dl__t2T11Z1tPv" "T1<t>::operator delete(void *)"
+    test_demangling_exact "gnu: __t2T11Zci" "T1<char>::T1(int)"
+    test_demangling_exact "gnu: __t2T11Zc" "T1<char>::T1(void)"
+    test_demangling_exact "gnu: __t2T11Z1ti" "T1<t>::T1(int)"
+    test_demangling_exact "gnu: __t2T11Z1t" "T1<t>::T1(void)"
+
+    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity3Pix" \
 	"List<VHDLEntity>::Pix::Pix(void)"
 
-    gdb_test_exact "maint demangle __Q2t4List1Z10VHDLEntity3PixPQ2t4List1Z10VHDLEntity7element" \
+    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity3PixPQ2t4List1Z10VHDLEntity7element" \
 	"List<VHDLEntity>::Pix::Pix(List<VHDLEntity>::element *)"
 
-    gdb_test_exact "maint demangle __Q2t4List1Z10VHDLEntity3PixRCQ2t4List1Z10VHDLEntity3Pix" \
+    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity3PixRCQ2t4List1Z10VHDLEntity3Pix" \
 	"List<VHDLEntity>::Pix::Pix(List<VHDLEntity>::Pix const &)"
 
-    gdb_test_exact "maint demangle __Q2t4List1Z10VHDLEntity7elementRC10VHDLEntityPT0" \
+    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity7elementRC10VHDLEntityPT0" \
 	"List<VHDLEntity>::element::element(VHDLEntity const &, List<VHDLEntity>::element *)"
 
-    gdb_test_exact "maint demangle __Q2t4List1Z10VHDLEntity7elementRCQ2t4List1Z10VHDLEntity7element" \
+    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity7elementRCQ2t4List1Z10VHDLEntity7element" \
 	"List<VHDLEntity>::element::element(List<VHDLEntity>::element const &)"
 
-    gdb_test_exact "maint demangle __cl__C11VHDLLibraryGt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
+    test_demangling_exact "gnu: __cl__C11VHDLLibraryGt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
 	"VHDLLibrary::operator()(PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> >) const"
 
-    gdb_test_exact "maint demangle __cl__Ct4List1Z10VHDLEntityRCQ2t4List1Z10VHDLEntity3Pix" \
+    test_demangling_exact "gnu: __cl__Ct4List1Z10VHDLEntityRCQ2t4List1Z10VHDLEntity3Pix" \
 	"List<VHDLEntity>::operator()(List<VHDLEntity>::Pix const &) const"
 
-    gdb_test_exact "maint demangle __ne__FPvRCQ2t4List1Z10VHDLEntity3Pix" \
+    test_demangling_exact "gnu: __ne__FPvRCQ2t4List1Z10VHDLEntity3Pix" \
 	"operator!=(void *, List<VHDLEntity>::Pix const &)"
 
-    gdb_test_exact "maint demangle __ne__FPvRCt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
+    test_demangling_exact "gnu: __ne__FPvRCt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
 	"operator!=(void *, PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> > const &)"
 
-    gdb_test_exact "maint demangle __t4List1Z10VHDLEntityRCt4List1Z10VHDLEntity" \
+    test_demangling_exact "gnu: __t4List1Z10VHDLEntityRCt4List1Z10VHDLEntity" \
 	"List<VHDLEntity>::List(List<VHDLEntity> const &)"
 
-    gdb_test_exact "maint demangle __t4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
+    test_demangling_exact "gnu: __t4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
 	"PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> >::PixX(void)"
 
-    gdb_test_exact "maint demangle __t4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntityP14VHDLLibraryRepGQ2t4List1Z10VHDLEntity3Pix" \
+    test_demangling_exact "gnu: __t4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntityP14VHDLLibraryRepGQ2t4List1Z10VHDLEntity3Pix" \
 	"PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> >::PixX(VHDLLibraryRep *, List<VHDLEntity>::Pix)"
 
-    gdb_test_exact "maint demangle __t4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntityRCt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
+    test_demangling_exact "gnu: __t4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntityRCt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
 	"PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> >::PixX(PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> > const &)"
 
-    gdb_test_exact "maint demangle nextE__C11VHDLLibraryRt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
+    test_demangling_exact "gnu: nextE__C11VHDLLibraryRt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
 	"VHDLLibrary::nextE(PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> > &) const"
 
-    gdb_test_exact "maint demangle next__Ct4List1Z10VHDLEntityRQ2t4List1Z10VHDLEntity3Pix" \
+    test_demangling_exact "gnu: next__Ct4List1Z10VHDLEntityRQ2t4List1Z10VHDLEntity3Pix" \
 	"List<VHDLEntity>::next(List<VHDLEntity>::Pix &) const"
 
-    gdb_test_exact "maint demangle _GLOBAL_\$D\$set" "global destructors keyed to set"
+    test_demangling_exact "gnu: _GLOBAL_\$D\$set" "global destructors keyed to set"
 
-    gdb_test_exact "maint demangle _GLOBAL_\$I\$set" "global constructors keyed to set"
+    test_demangling_exact "gnu: _GLOBAL_\$I\$set" "global constructors keyed to set"
 
-    gdb_test_exact "maint demangle __as__t5ListS1ZUiRCt5ListS1ZUi" \
+    test_demangling_exact "gnu: __as__t5ListS1ZUiRCt5ListS1ZUi" \
 	"ListS<unsigned int>::operator=(ListS<unsigned int> const &)"
 
-    gdb_test_exact "maint demangle __cl__Ct5ListS1ZUiRCQ2t5ListS1ZUi3Vix" \
+    test_demangling_exact "gnu: __cl__Ct5ListS1ZUiRCQ2t5ListS1ZUi3Vix" \
 	"ListS<unsigned int>::operator()(ListS<unsigned int>::Vix const &) const"
 
-    gdb_test_exact "maint demangle __cl__Ct5SetLS1ZUiRCQ2t5SetLS1ZUi3Vix" \
+    test_demangling_exact "gnu: __cl__Ct5SetLS1ZUiRCQ2t5SetLS1ZUi3Vix" \
 	"SetLS<unsigned int>::operator()(SetLS<unsigned int>::Vix const &) const"
 
-    gdb_test_exact "maint demangle __t10ListS_link1ZUiRCUiPT0" \
+    test_demangling_exact "gnu: __t10ListS_link1ZUiRCUiPT0" \
 	"ListS_link<unsigned int>::ListS_link(unsigned int const &, ListS_link<unsigned int> *)"
 
-    gdb_test_exact "maint demangle __t10ListS_link1ZUiRCt10ListS_link1ZUi" \
+    test_demangling_exact "gnu: __t10ListS_link1ZUiRCt10ListS_link1ZUi" \
 	"ListS_link<unsigned int>::ListS_link(ListS_link<unsigned int> const &)"
 
-    gdb_test_exact "maint demangle __t5ListS1ZUiRCt5ListS1ZUi" \
+    test_demangling_exact "gnu: __t5ListS1ZUiRCt5ListS1ZUi" \
 	"ListS<unsigned int>::ListS(ListS<unsigned int> const &)"
 
-    gdb_test_exact "maint demangle next__Ct5ListS1ZUiRQ2t5ListS1ZUi3Vix" \
+    test_demangling_exact "gnu: next__Ct5ListS1ZUiRQ2t5ListS1ZUi3Vix" \
 	"ListS<unsigned int>::next(ListS<unsigned int>::Vix &) const"
 
-    gdb_test_exact "maint demangle __ne__FPvRCQ2t5SetLS1ZUi3Vix" \
+    test_demangling_exact "gnu: __ne__FPvRCQ2t5SetLS1ZUi3Vix" \
 	"operator!=(void *, SetLS<unsigned int>::Vix const &)"
-    gdb_test_exact "maint demangle __t8ListElem1Z5LabelRt4List1Z5Label" \
+    test_demangling_exact "gnu: __t8ListElem1Z5LabelRt4List1Z5Label" \
 	"ListElem<Label>::ListElem(List<Label> &)"
-    gdb_test_exact "maint demangle __t8BDDHookV1ZPcRCPc" \
+    test_demangling_exact "gnu: __t8BDDHookV1ZPcRCPc" \
 	"BDDHookV<char *>::BDDHookV(char *const &)"
 
-    gdb_test_exact "maint demangle _vt\$t8BDDHookV1ZPc" "BDDHookV<char *> virtual table"
+    test_demangling_exact "gnu: _vt\$t8BDDHookV1ZPc" "BDDHookV<char *> virtual table"
 
-    gdb_test_exact "maint demangle __ne__FPvRCQ211BDDFunction4VixB" \
+    test_demangling_exact "gnu: __ne__FPvRCQ211BDDFunction4VixB" \
 	"operator!=(void *, BDDFunction::VixB const &)"
-    gdb_test_exact "maint demangle __eq__FPvRCQ211BDDFunction4VixB" \
+    test_demangling_exact "gnu: __eq__FPvRCQ211BDDFunction4VixB" \
 	"operator==(void *, BDDFunction::VixB const &)"
 
-    gdb_test_exact "maint demangle relativeId__CQ36T_phi210T_preserve8FPC_nextRCQ26T_phi210T_preserveRC10Parameters" \
+    test_demangling_exact "gnu: relativeId__CQ36T_phi210T_preserve8FPC_nextRCQ26T_phi210T_preserveRC10Parameters" \
 	 "T_phi2::T_preserve::FPC_next::relativeId(T_phi2::T_preserve const &, Parameters const &) const"
 
+    test_demangling_exact "gnu: _Utf390_1__1_9223372036854775807__9223372036854775" \
+	    "Can't demangle \"_Utf390_1__1_9223372036854775807__9223372036854775\""
+    test_demangling_exact "gnu: foo__I40" "foo(int64_t)"
+    test_demangling_exact "gnu: foo__I_200_" "foo(int512_t)"
+    test_demangling_exact "gnu: foo__I_200" "Can't demangle \"foo__I_200\""
+
+    ## Buffer overrun.  Should make GDB crash.  Woo hoo!
+    test_demangling_exact "gnu: foo__I_4000000000000000000000000000000000000000000000000000000000000000000000000" "Can't demangle \"foo__I_4000000000000000000000000000000000000000000000000000000000000000000000000\""
+
+    ## 1999-04-19: "Fix from Dale Hawkins".  Shouldn't segfault.
+    test_demangling_exact "gnu: __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator" "Can't demangle \"__thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator\""
 }
 
 #
@@ -453,277 +537,260 @@ proc test_gnu_style_demangling {} {
 #
 
 proc test_lucid_style_demangling {} {
-    global gdb_prompt
-
-    # Set the demangling style to "lucid" and then check to make sure
-    # it really got set.  Return if the style failed to get set for
-    # some reason.
-
-    send_gdb "set demangle-style lucid\n"
-    gdb_expect {
-	-re "set demangle-style lucid\[\r\n\]+$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" { fail "set demangle-style lucid failed" ; return }
-	timeout { fail "set demangle-style lucid failed (timeout)" ; return }
-    }
-
-    send_gdb "show demangle-style\n"
-    gdb_expect {
-	-re "The current C\[+\]+ demangling style is \"lucid\".\r\n$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" { fail "demangling style not set to lucid" }
-	timeout { fail "show demangle-style timed out" }
-    }
-
-    gdb_test_exact "maint demangle WS__FR7istream" "WS(istream &)"
-    gdb_test_exact "maint demangle __aa__3fooFR3foo" "foo::operator&&(foo &)"
-    gdb_test_exact "maint demangle __aad__3fooFR3foo" "foo::operator&=(foo &)"
-    gdb_test_exact "maint demangle __ad__3fooFR3foo" "foo::operator&(foo &)"
-    gdb_test_exact "maint demangle __adv__3fooFR3foo" "foo::operator/=(foo &)"
-    gdb_test_exact "maint demangle __adv__7complexF7complex" "complex::operator/=(complex)"
-    gdb_test_exact "maint demangle __aer__3fooFR3foo" "foo::operator^=(foo &)"
-    gdb_test_exact "maint demangle __als__3fooFR3foo" "foo::operator<<=(foo &)"
-    gdb_test_exact "maint demangle __amd__3fooFR3foo" "foo::operator%=(foo &)"
-    gdb_test_exact "maint demangle __ami__3fooFR3foo" "foo::operator-=(foo &)"
-    gdb_test_exact "maint demangle __amu__3fooFR3foo" "foo::operator*=(foo &)"
-    gdb_test_exact "maint demangle __amu__7complexF7complex" "complex::operator*=(complex)"
-    gdb_test_exact "maint demangle __aor__3fooFR3foo" "foo::operator|=(foo &)"
-    gdb_test_exact "maint demangle __apl__3fooFR3foo" "foo::operator+=(foo &)"
-    gdb_test_exact "maint demangle __ars__3fooFR3foo" "foo::operator>>=(foo &)"
-    gdb_test_exact "maint demangle __as__18istream_withassignFP9streambuf" "istream_withassign::operator=(streambuf *)"
-    gdb_test_exact "maint demangle __as__18istream_withassignFR7istream" "istream_withassign::operator=(istream &)"
-    gdb_test_exact "maint demangle __as__3fooFR3foo" "foo::operator=(foo &)"
-    gdb_test_exact "maint demangle __as__3iosFR3ios" "ios::operator=(ios &)"
-    gdb_test_exact "maint demangle __cl__3fooFR3foo" "foo::operator()(foo &)"
-    gdb_test_exact "maint demangle __cm__3fooFR3foo" "foo::operator, (foo &)"
-
-    gdb_test_exact "maint demangle __co__3fooFv" "foo::operator~(void)"
-    gdb_test_exact "maint demangle __ct__10istrstreamFPc" "istrstream::istrstream(char *)"
-    gdb_test_exact "maint demangle __ct__10istrstreamFPci" "istrstream::istrstream(char *, int)"
-    gdb_test_exact "maint demangle __ct__10ostrstreamFPciT2" "ostrstream::ostrstream(char *, int, int)"
-    gdb_test_exact "maint demangle __ct__10ostrstreamFv" "ostrstream::ostrstream(void)"
-    gdb_test_exact "maint demangle __ct__10smanip_intFPFR3iosi_R3iosi" "smanip_int::smanip_int(ios &(*)(ios &, int), int)"
-    gdb_test "maint dem __ct__11c_exceptionFPcRC7complexT2" "c_exception::c_exception\[(\]+char \[*\]+, (const complex|complex const) &, (const complex|complex const) &\[)\]+"
-    gdb_test "maint dem __ct__11fstreambaseFPCciT2" "fstreambase::fstreambase\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    gdb_test_exact "maint demangle __ct__11fstreambaseFi" "fstreambase::fstreambase(int)"
-    gdb_test_exact "maint demangle __ct__11fstreambaseFiPcT1" "fstreambase::fstreambase(int, char *, int)"
-    gdb_test_exact "maint demangle __ct__11fstreambaseFv" "fstreambase::fstreambase(void)"
-    gdb_test_exact "maint demangle __ct__11smanip_longFPFR3iosl_R3iosl" "smanip_long::smanip_long(ios &(*)(ios &, long), long)"
-    gdb_test_exact "maint demangle __ct__11stdiostreamFP4FILE" "stdiostream::stdiostream(FILE *)"
-    gdb_test_exact "maint demangle __ct__12strstreambufFPFl_PvPFPv_v" "strstreambuf::strstreambuf(void *(*)(long), void (*)(void *))"
-    gdb_test_exact "maint demangle __ct__12strstreambufFPUciT1" "strstreambuf::strstreambuf(unsigned char *, int, unsigned char *)"
-    gdb_test_exact "maint demangle __ct__12strstreambufFPciT1" "strstreambuf::strstreambuf(char *, int, char *)"
-    gdb_test_exact "maint demangle __ct__12strstreambufFi" "strstreambuf::strstreambuf(int)"
-    gdb_test_exact "maint demangle __ct__12strstreambufFv" "strstreambuf::strstreambuf(void)"
-    gdb_test_exact "maint demangle __ct__13strstreambaseFPciT1" "strstreambase::strstreambase(char *, int, char *)"
-    gdb_test_exact "maint demangle __ct__3fooFR3foo" "foo::foo(foo &)"
-
-    gdb_test_exact "maint demangle __ct__3fooFi" "foo::foo(int)"
-    gdb_test_exact "maint demangle __ct__3fooFiN31" "foo::foo(int, int, int, int)"
-    gdb_test "maint dem __ct__3fooFiPCc" \
+    test_demangling_exact "lucid: WS__FR7istream" "WS(istream &)"
+    test_demangling_exact "lucid: __aa__3fooFR3foo" "foo::operator&&(foo &)"
+    test_demangling_exact "lucid: __aad__3fooFR3foo" "foo::operator&=(foo &)"
+    test_demangling_exact "lucid: __ad__3fooFR3foo" "foo::operator&(foo &)"
+    test_demangling_exact "lucid: __adv__3fooFR3foo" "foo::operator/=(foo &)"
+    test_demangling_exact "lucid: __adv__7complexF7complex" "complex::operator/=(complex)"
+    test_demangling_exact "lucid: __aer__3fooFR3foo" "foo::operator^=(foo &)"
+    test_demangling_exact "lucid: __als__3fooFR3foo" "foo::operator<<=(foo &)"
+    test_demangling_exact "lucid: __amd__3fooFR3foo" "foo::operator%=(foo &)"
+    test_demangling_exact "lucid: __ami__3fooFR3foo" "foo::operator-=(foo &)"
+    test_demangling_exact "lucid: __amu__3fooFR3foo" "foo::operator*=(foo &)"
+    test_demangling_exact "lucid: __amu__7complexF7complex" "complex::operator*=(complex)"
+    test_demangling_exact "lucid: __aor__3fooFR3foo" "foo::operator|=(foo &)"
+    test_demangling_exact "lucid: __apl__3fooFR3foo" "foo::operator+=(foo &)"
+    test_demangling_exact "lucid: __ars__3fooFR3foo" "foo::operator>>=(foo &)"
+    test_demangling_exact "lucid: __as__18istream_withassignFP9streambuf" "istream_withassign::operator=(streambuf *)"
+    test_demangling_exact "lucid: __as__18istream_withassignFR7istream" "istream_withassign::operator=(istream &)"
+    test_demangling_exact "lucid: __as__3fooFR3foo" "foo::operator=(foo &)"
+    test_demangling_exact "lucid: __as__3iosFR3ios" "ios::operator=(ios &)"
+    test_demangling_exact "lucid: __cl__3fooFR3foo" "foo::operator()(foo &)"
+    test_demangling_exact "lucid: __cm__3fooFR3foo" "foo::operator, (foo &)"
+
+    test_demangling_exact "lucid: __co__3fooFv" "foo::operator~(void)"
+    test_demangling_exact "lucid: __ct__10istrstreamFPc" "istrstream::istrstream(char *)"
+    test_demangling_exact "lucid: __ct__10istrstreamFPci" "istrstream::istrstream(char *, int)"
+    test_demangling_exact "lucid: __ct__10ostrstreamFPciT2" "ostrstream::ostrstream(char *, int, int)"
+    test_demangling_exact "lucid: __ct__10ostrstreamFv" "ostrstream::ostrstream(void)"
+    test_demangling_exact "lucid: __ct__10smanip_intFPFR3iosi_R3iosi" "smanip_int::smanip_int(ios &(*)(ios &, int), int)"
+    test_demangling "lucid: __ct__11c_exceptionFPcRC7complexT2" "c_exception::c_exception\[(\]+char \[*\]+, (const complex|complex const) &, (const complex|complex const) &\[)\]+"
+    test_demangling "lucid: __ct__11fstreambaseFPCciT2" "fstreambase::fstreambase\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
+    test_demangling_exact "lucid: __ct__11fstreambaseFi" "fstreambase::fstreambase(int)"
+    test_demangling_exact "lucid: __ct__11fstreambaseFiPcT1" "fstreambase::fstreambase(int, char *, int)"
+    test_demangling_exact "lucid: __ct__11fstreambaseFv" "fstreambase::fstreambase(void)"
+    test_demangling_exact "lucid: __ct__11smanip_longFPFR3iosl_R3iosl" "smanip_long::smanip_long(ios &(*)(ios &, long), long)"
+    test_demangling_exact "lucid: __ct__11stdiostreamFP4FILE" "stdiostream::stdiostream(FILE *)"
+    test_demangling_exact "lucid: __ct__12strstreambufFPFl_PvPFPv_v" "strstreambuf::strstreambuf(void *(*)(long), void (*)(void *))"
+    test_demangling_exact "lucid: __ct__12strstreambufFPUciT1" "strstreambuf::strstreambuf(unsigned char *, int, unsigned char *)"
+    test_demangling_exact "lucid: __ct__12strstreambufFPciT1" "strstreambuf::strstreambuf(char *, int, char *)"
+    test_demangling_exact "lucid: __ct__12strstreambufFi" "strstreambuf::strstreambuf(int)"
+    test_demangling_exact "lucid: __ct__12strstreambufFv" "strstreambuf::strstreambuf(void)"
+    test_demangling_exact "lucid: __ct__13strstreambaseFPciT1" "strstreambase::strstreambase(char *, int, char *)"
+    test_demangling_exact "lucid: __ct__3fooFR3foo" "foo::foo(foo &)"
+
+    test_demangling_exact "lucid: __ct__3fooFi" "foo::foo(int)"
+    test_demangling_exact "lucid: __ct__3fooFiN31" "foo::foo(int, int, int, int)"
+    test_demangling "lucid: __ct__3fooFiPCc" \
 	"foo::foo\[(\]+int, (const char|char const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle __ct__3fooFiR3fooT1T2T1T2" "foo::foo(int, foo &, int, foo &, int, foo &)"
-    gdb_test_exact "maint demangle __ct__3iosFP9streambuf" "ios::ios(streambuf *)"
-    gdb_test_exact "maint demangle __ct__7filebufFiPcT1" "filebuf::filebuf(int, char *, int)"
-    gdb_test "maint dem __ct__7fstreamFPCciT2" \
+    test_demangling_exact "lucid: __ct__3fooFiR3fooT1T2T1T2" "foo::foo(int, foo &, int, foo &, int, foo &)"
+    test_demangling_exact "lucid: __ct__3iosFP9streambuf" "ios::ios(streambuf *)"
+    test_demangling_exact "lucid: __ct__7filebufFiPcT1" "filebuf::filebuf(int, char *, int)"
+    test_demangling "lucid: __ct__7fstreamFPCciT2" \
 	"fstream::fstream\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    gdb_test_exact "maint demangle __ct__7fstreamFiPcT1" "fstream::fstream(int, char *, int)"
-    gdb_test_exact "maint demangle __ct__7istreamFP9streambuf" "istream::istream(streambuf *)"
-    gdb_test_exact "maint demangle __ct__7istreamFP9streambufiP7ostream" "istream::istream(streambuf *, int, ostream *)"
-    gdb_test_exact "maint demangle __ct__7istreamFiPcT1" "istream::istream(int, char *, int)"
-    gdb_test_exact "maint demangle __ct__7istreamFiT1P7ostream" "istream::istream(int, int, ostream *)"
-    gdb_test_exact "maint demangle __ct__7ostreamFP9streambuf" "ostream::ostream(streambuf *)"
-    gdb_test_exact "maint demangle __ct__7ostreamFiPc" "ostream::ostream(int, char *)"
-    gdb_test "maint dem __ct__8ifstreamFPCciT2" \
+    test_demangling_exact "lucid: __ct__7fstreamFiPcT1" "fstream::fstream(int, char *, int)"
+    test_demangling_exact "lucid: __ct__7istreamFP9streambuf" "istream::istream(streambuf *)"
+    test_demangling_exact "lucid: __ct__7istreamFP9streambufiP7ostream" "istream::istream(streambuf *, int, ostream *)"
+    test_demangling_exact "lucid: __ct__7istreamFiPcT1" "istream::istream(int, char *, int)"
+    test_demangling_exact "lucid: __ct__7istreamFiT1P7ostream" "istream::istream(int, int, ostream *)"
+    test_demangling_exact "lucid: __ct__7ostreamFP9streambuf" "ostream::ostream(streambuf *)"
+    test_demangling_exact "lucid: __ct__7ostreamFiPc" "ostream::ostream(int, char *)"
+    test_demangling "lucid: __ct__8ifstreamFPCciT2" \
 	"ifstream::ifstream\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    gdb_test_exact "maint demangle __ct__8ifstreamFiPcT1" "ifstream::ifstream(int, char *, int)"
-
-    gdb_test_exact "maint demangle __ct__Q23foo3barFv" "foo::bar::bar(void)"
-    gdb_test_exact "maint demangle __ct__Q33foo3bar4bellFv" "foo::bar::bell::bell(void)"
-    gdb_test_exact "maint demangle __dl__3fooSFPv" "foo::operator delete(void *) static"
-    gdb_test_exact "maint demangle __dl__FPv" "operator delete(void *)"
-    gdb_test_exact "maint demangle __dt__10istrstreamFv" "istrstream::~istrstream(void)"
-
-    gdb_test_exact "maint demangle __dt__Q23foo3barFv" "foo::bar::~bar(void)"
-    gdb_test_exact "maint demangle __dt__Q33foo3bar4bellFv" "foo::bar::bell::~bell(void)"
-    gdb_test_exact "maint demangle __dv__3fooFR3foo" "foo::operator/(foo &)"
-    gdb_test_exact "maint demangle __dv__F7complexT1" "operator/(complex, complex)"
-    gdb_test_exact "maint demangle __eq__3fooFR3foo" "foo::operator==(foo &)"
-    gdb_test_exact "maint demangle __er__3fooFR3foo" "foo::operator^(foo &)"
-    gdb_test_exact "maint demangle __ge__3fooFR3foo" "foo::operator>=(foo &)"
-    gdb_test_exact "maint demangle __gt__3fooFR3foo" "foo::operator>(foo &)"
-    gdb_test_exact "maint demangle __le__3fooFR3foo" "foo::operator<=(foo &)"
-    gdb_test_exact "maint demangle __ls__3fooFR3foo" "foo::operator<<(foo &)"
-    gdb_test_exact "maint demangle __ls__7ostreamFP9streambuf" "ostream::operator<<(streambuf *)"
-
-    gdb_test "maint dem __ls__7ostreamFPCc" \
+    test_demangling_exact "lucid: __ct__8ifstreamFiPcT1" "ifstream::ifstream(int, char *, int)"
+
+    test_demangling_exact "lucid: __ct__Q23foo3barFv" "foo::bar::bar(void)"
+    test_demangling_exact "lucid: __ct__Q33foo3bar4bellFv" "foo::bar::bell::bell(void)"
+    test_demangling_exact "lucid: __dl__3fooSFPv" "foo::operator delete(void *) static"
+    test_demangling_exact "lucid: __dl__FPv" "operator delete(void *)"
+    test_demangling_exact "lucid: __dt__10istrstreamFv" "istrstream::~istrstream(void)"
+
+    test_demangling_exact "lucid: __dt__Q23foo3barFv" "foo::bar::~bar(void)"
+    test_demangling_exact "lucid: __dt__Q33foo3bar4bellFv" "foo::bar::bell::~bell(void)"
+    test_demangling_exact "lucid: __dv__3fooFR3foo" "foo::operator/(foo &)"
+    test_demangling_exact "lucid: __dv__F7complexT1" "operator/(complex, complex)"
+    test_demangling_exact "lucid: __eq__3fooFR3foo" "foo::operator==(foo &)"
+    test_demangling_exact "lucid: __er__3fooFR3foo" "foo::operator^(foo &)"
+    test_demangling_exact "lucid: __ge__3fooFR3foo" "foo::operator>=(foo &)"
+    test_demangling_exact "lucid: __gt__3fooFR3foo" "foo::operator>(foo &)"
+    test_demangling_exact "lucid: __le__3fooFR3foo" "foo::operator<=(foo &)"
+    test_demangling_exact "lucid: __ls__3fooFR3foo" "foo::operator<<(foo &)"
+    test_demangling_exact "lucid: __ls__7ostreamFP9streambuf" "ostream::operator<<(streambuf *)"
+
+    test_demangling "lucid: __ls__7ostreamFPCc" \
 	"ostream::operator<<\[(\]+(const char|char const) \[*\]+\[)\]+"
-    gdb_test_exact "maint demangle __ls__7ostreamFPFR3ios_R3ios" "ostream::operator<<(ios &(*)(ios &))"
-    gdb_test_exact "maint demangle __ls__7ostreamFPv" "ostream::operator<<(void *)"
-    gdb_test_exact "maint demangle __ls__7ostreamFUi" "ostream::operator<<(unsigned int)"
-    gdb_test_exact "maint demangle __ls__7ostreamFUl" "ostream::operator<<(unsigned long)"
-    gdb_test_exact "maint demangle __ls__7ostreamFd" "ostream::operator<<(double)"
-    gdb_test_exact "maint demangle __ls__7ostreamFf" "ostream::operator<<(float)"
-    gdb_test_exact "maint demangle __ls__7ostreamFi" "ostream::operator<<(int)"
-    gdb_test_exact "maint demangle __ls__7ostreamFl" "ostream::operator<<(long)"
-    gdb_test_exact "maint demangle __ls__FR7ostream7complex" "operator<<(ostream &, complex)"
-    gdb_test_exact "maint demangle __lt__3fooFR3foo" "foo::operator<(foo &)"
-    gdb_test_exact "maint demangle __md__3fooFR3foo" "foo::operator%(foo &)"
-    gdb_test_exact "maint demangle __mi__3fooFR3foo" "foo::operator-(foo &)"
-    gdb_test_exact "maint demangle __ml__3fooFR3foo" "foo::operator*(foo &)"
-    gdb_test_exact "maint demangle __ml__F7complexT1" "operator*(complex, complex)"
-    gdb_test_exact "maint demangle __mm__3fooFi" "foo::operator--(int)"
-    gdb_test_exact "maint demangle __ne__3fooFR3foo" "foo::operator!=(foo &)"
-    gdb_test_exact "maint demangle __nt__3fooFv" "foo::operator!(void)"
-    gdb_test_exact "maint demangle __nw__3fooSFi" "foo::operator new(int) static"
-    gdb_test_exact "maint demangle __nw__FUi" "operator new(unsigned int)"
-    gdb_test_exact "maint demangle __nw__FUiPv" "operator new(unsigned int, void *)"
-    gdb_test_exact "maint demangle __oo__3fooFR3foo" "foo::operator||(foo &)"
-    gdb_test_exact "maint demangle __opPc__3fooFv" "foo::operator char *(void)"
-    gdb_test_exact "maint demangle __opi__3fooFv" "foo::operator int(void)"
-    gdb_test_exact "maint demangle __or__3fooFR3foo" "foo::operator|(foo &)"
-
-    gdb_test_exact "maint demangle __pl__3fooFR3foo" "foo::operator+(foo &)"
-    gdb_test_exact "maint demangle __pp__3fooFi" "foo::operator++(int)"
-    gdb_test_exact "maint demangle __pt__3fooFv" "foo::operator->(void)"
-    gdb_test_exact "maint demangle __rm__3fooFR3foo" "foo::operator->*(foo &)"
-    gdb_test_exact "maint demangle __rs__3fooFR3foo" "foo::operator>>(foo &)"
-    gdb_test_exact "maint demangle __rs__7istreamFP9streambuf" "istream::operator>>(streambuf *)"
-    gdb_test_exact "maint demangle __rs__7istreamFPFR3ios_R3ios" "istream::operator>>(ios &(*)(ios &))"
-    gdb_test_exact "maint demangle __rs__7istreamFPFR7istream_R7istream" "istream::operator>>(istream &(*)(istream &))"
-    gdb_test_exact "maint demangle __rs__7istreamFPUc" "istream::operator>>(unsigned char *)"
-    gdb_test_exact "maint demangle __rs__7istreamFPc" "istream::operator>>(char *)"
-    gdb_test_exact "maint demangle __rs__7istreamFRUi" "istream::operator>>(unsigned int &)"
-    gdb_test_exact "maint demangle __rs__7istreamFRUl" "istream::operator>>(unsigned long &)"
-    gdb_test_exact "maint demangle __rs__7istreamFRUs" "istream::operator>>(unsigned short &)"
-    gdb_test_exact "maint demangle __rs__7istreamFRd" "istream::operator>>(double &)"
-    gdb_test_exact "maint demangle __rs__7istreamFRf" "istream::operator>>(float &)"
-    gdb_test_exact "maint demangle __rs__7istreamFRi" "istream::operator>>(int &)"
-    gdb_test_exact "maint demangle __rs__7istreamFRl" "istream::operator>>(long &)"
-    gdb_test_exact "maint demangle __rs__7istreamFRs" "istream::operator>>(short &)"
-    gdb_test_exact "maint demangle __rs__FR7istreamR7complex" "operator>>(istream &, complex &)"
-    gdb_test "maint dem __vc__3fooFR3foo" "foo::operator\\\[\\\]\\(foo &\\)"
-    gdb_test_exact "maint demangle __vtbl__10istrstream" "istrstream virtual table"
-    gdb_test_exact "maint demangle __vtbl__17ostream__iostream__19iostream_withassign" "iostream_withassign::ostream__iostream virtual table"
-
-    gdb_test_exact "maint demangle __vtbl__3ios" "ios virtual table"
-    gdb_test_exact "maint demangle __vtbl__3ios__13strstreambase" "strstreambase::ios virtual table"
+    test_demangling_exact "lucid: __ls__7ostreamFPFR3ios_R3ios" "ostream::operator<<(ios &(*)(ios &))"
+    test_demangling_exact "lucid: __ls__7ostreamFPv" "ostream::operator<<(void *)"
+    test_demangling_exact "lucid: __ls__7ostreamFUi" "ostream::operator<<(unsigned int)"
+    test_demangling_exact "lucid: __ls__7ostreamFUl" "ostream::operator<<(unsigned long)"
+    test_demangling_exact "lucid: __ls__7ostreamFd" "ostream::operator<<(double)"
+    test_demangling_exact "lucid: __ls__7ostreamFf" "ostream::operator<<(float)"
+    test_demangling_exact "lucid: __ls__7ostreamFi" "ostream::operator<<(int)"
+    test_demangling_exact "lucid: __ls__7ostreamFl" "ostream::operator<<(long)"
+    test_demangling_exact "lucid: __ls__FR7ostream7complex" "operator<<(ostream &, complex)"
+    test_demangling_exact "lucid: __lt__3fooFR3foo" "foo::operator<(foo &)"
+    test_demangling_exact "lucid: __md__3fooFR3foo" "foo::operator%(foo &)"
+    test_demangling_exact "lucid: __mi__3fooFR3foo" "foo::operator-(foo &)"
+    test_demangling_exact "lucid: __ml__3fooFR3foo" "foo::operator*(foo &)"
+    test_demangling_exact "lucid: __ml__F7complexT1" "operator*(complex, complex)"
+    test_demangling_exact "lucid: __mm__3fooFi" "foo::operator--(int)"
+    test_demangling_exact "lucid: __ne__3fooFR3foo" "foo::operator!=(foo &)"
+    test_demangling_exact "lucid: __nt__3fooFv" "foo::operator!(void)"
+    test_demangling_exact "lucid: __nw__3fooSFi" "foo::operator new(int) static"
+    test_demangling_exact "lucid: __nw__FUi" "operator new(unsigned int)"
+    test_demangling_exact "lucid: __nw__FUiPv" "operator new(unsigned int, void *)"
+    test_demangling_exact "lucid: __oo__3fooFR3foo" "foo::operator||(foo &)"
+    test_demangling_exact "lucid: __opPc__3fooFv" "foo::operator char *(void)"
+    test_demangling_exact "lucid: __opi__3fooFv" "foo::operator int(void)"
+    test_demangling_exact "lucid: __or__3fooFR3foo" "foo::operator|(foo &)"
+
+    test_demangling_exact "lucid: __pl__3fooFR3foo" "foo::operator+(foo &)"
+    test_demangling_exact "lucid: __pp__3fooFi" "foo::operator++(int)"
+    test_demangling_exact "lucid: __pt__3fooFv" "foo::operator->(void)"
+    test_demangling_exact "lucid: __rm__3fooFR3foo" "foo::operator->*(foo &)"
+    test_demangling_exact "lucid: __rs__3fooFR3foo" "foo::operator>>(foo &)"
+    test_demangling_exact "lucid: __rs__7istreamFP9streambuf" "istream::operator>>(streambuf *)"
+    test_demangling_exact "lucid: __rs__7istreamFPFR3ios_R3ios" "istream::operator>>(ios &(*)(ios &))"
+    test_demangling_exact "lucid: __rs__7istreamFPFR7istream_R7istream" "istream::operator>>(istream &(*)(istream &))"
+    test_demangling_exact "lucid: __rs__7istreamFPUc" "istream::operator>>(unsigned char *)"
+    test_demangling_exact "lucid: __rs__7istreamFPc" "istream::operator>>(char *)"
+    test_demangling_exact "lucid: __rs__7istreamFRUi" "istream::operator>>(unsigned int &)"
+    test_demangling_exact "lucid: __rs__7istreamFRUl" "istream::operator>>(unsigned long &)"
+    test_demangling_exact "lucid: __rs__7istreamFRUs" "istream::operator>>(unsigned short &)"
+    test_demangling_exact "lucid: __rs__7istreamFRd" "istream::operator>>(double &)"
+    test_demangling_exact "lucid: __rs__7istreamFRf" "istream::operator>>(float &)"
+    test_demangling_exact "lucid: __rs__7istreamFRi" "istream::operator>>(int &)"
+    test_demangling_exact "lucid: __rs__7istreamFRl" "istream::operator>>(long &)"
+    test_demangling_exact "lucid: __rs__7istreamFRs" "istream::operator>>(short &)"
+    test_demangling_exact "lucid: __rs__FR7istreamR7complex" "operator>>(istream &, complex &)"
+    test_demangling "lucid: __vc__3fooFR3foo" "foo::operator\\\[\\\]\\(foo &\\)"
+    test_demangling_exact "lucid: __vtbl__10istrstream" "istrstream virtual table"
+    test_demangling_exact "lucid: __vtbl__17ostream__iostream__19iostream_withassign" "iostream_withassign::ostream__iostream virtual table"
+
+    test_demangling_exact "lucid: __vtbl__3ios" "ios virtual table"
+    test_demangling_exact "lucid: __vtbl__3ios__13strstreambase" "strstreambase::ios virtual table"
 
     # GDB 930414 demangles this as t_cc_main_ (obviously wrong).
     # GDB 930701 gets into an infinite loop.
     # GDB 930727 says "Can't demangle".
     # What is the correct demangling?  FIXME.
     setup_xfail "*-*-*"
-    gdb_test_exact "maint demangle __vtbl__3foo__vt_cc_main_" ""
-
-    gdb_test_exact "maint demangle abs__F7complex" "abs(complex)"
-    gdb_test_exact "maint demangle allocate__9streambufFv" "streambuf::allocate(void)"
-    gdb_test_exact "maint demangle attach__11fstreambaseFi" "fstreambase::attach(int)"
-    gdb_test_exact "maint demangle bitalloc__3iosSFv" "ios::bitalloc(void) static"
-    gdb_test_exact "maint demangle chr__FiT1" "chr(int, int)"
-    gdb_test_exact "maint demangle complex_error__FR11c_exception" "complex_error(c_exception &)"
-    gdb_test_exact "maint demangle complexfunc2__FPFPc_i" "complexfunc2(int (*)(char *))"
-    gdb_test_exact "maint demangle complexfunc3__FPFPFPl_s_i" "complexfunc3(int (*)(short (*)(long *)))"
-
-    gdb_test_exact "maint demangle complexfunc4__FPFPFPc_s_i" "complexfunc4(int (*)(short (*)(char *)))"
-    gdb_test_exact "maint demangle complexfunc5__FPFPc_PFl_i" "complexfunc5(int (*(*)(char *))(long))"
-    gdb_test_exact "maint demangle complexfunc6__FPFPi_PFl_i" "complexfunc6(int (*(*)(int *))(long))"
-    gdb_test_exact "maint demangle complexfunc7__FPFPFPc_i_PFl_i" "complexfunc7(int (*(*)(int (*)(char *)))(long))"
-    gdb_test_exact "maint demangle complicated_put__7ostreamFc" "ostream::complicated_put(char)"
-    gdb_test_exact "maint demangle conv10__FlPc" "conv10(long, char *)"
-    gdb_test_exact "maint demangle conv16__FUlPc" "conv16(unsigned long, char *)"
-    gdb_test_exact "maint demangle dec__FR3ios" "dec(ios &)"
-    gdb_test_exact "maint demangle dec__Fli" "dec(long, int)"
-    gdb_test_exact "maint demangle dofield__FP7ostreamPciT2T3" "dofield(ostream *, char *, int, char *, int)"
-
-    gdb_test_exact "maint demangle flags__3iosFl" "ios::flags(long)"
-    gdb_test_exact "maint demangle flags__3iosFv" "ios::flags(void)"
-    gdb_test_exact "maint demangle foo__FiN31" "foo(int, int, int, int)"
-    gdb_test_exact "maint demangle foo__FiR3fooT1T2T1T2" "foo(int, foo &, int, foo &, int, foo &)"
-    gdb_test_exact "maint demangle foo___3barFl" "bar::foo_(long)"
-    gdb_test "maint dem form__FPCce" "form\[(\]+(const char|char const) \[*\]+,...\[)\]+"
-    gdb_test_exact "maint demangle get__7istreamFPcic" "istream::get(char *, int, char)"
-    gdb_test_exact "maint demangle get__7istreamFR9streambufc" "istream::get(streambuf &, char)"
-    gdb_test_exact "maint demangle get_complicated__7istreamFRUc" "istream::get_complicated(unsigned char &)"
-    gdb_test_exact "maint demangle get_complicated__7istreamFRc" "istream::get_complicated(char &)"
-    gdb_test_exact "maint demangle getline__7istreamFPUcic" "istream::getline(unsigned char *, int, char)"
-    gdb_test_exact "maint demangle getline__7istreamFPcic" "istream::getline(char *, int, char)"
-
-    gdb_test_exact "maint demangle ignore__7istreamFiT1" "istream::ignore(int, int)"
-    gdb_test_exact "maint demangle init__12strstreambufFPciT1" "strstreambuf::init(char *, int, char *)"
-    gdb_test_exact "maint demangle init__3iosFP9streambuf" "ios::init(streambuf *)"
-    gdb_test_exact "maint demangle initcount__13Iostream_init" "Iostream_init::initcount"
-    gdb_test_exact "maint demangle ipfx__7istreamFi" "istream::ipfx(int)"
-    gdb_test_exact "maint demangle ls_complicated__7ostreamFUc" "ostream::ls_complicated(unsigned char)"
-    gdb_test_exact "maint demangle ls_complicated__7ostreamFc" "ostream::ls_complicated(char)"
-    gdb_test "maint dem open__11fstreambaseFPCciT2" \
+    test_demangling_exact "lucid: __vtbl__3foo__vt_cc_main_" ""
+
+    test_demangling_exact "lucid: abs__F7complex" "abs(complex)"
+    test_demangling_exact "lucid: allocate__9streambufFv" "streambuf::allocate(void)"
+    test_demangling_exact "lucid: attach__11fstreambaseFi" "fstreambase::attach(int)"
+    test_demangling_exact "lucid: bitalloc__3iosSFv" "ios::bitalloc(void) static"
+    test_demangling_exact "lucid: chr__FiT1" "chr(int, int)"
+    test_demangling_exact "lucid: complex_error__FR11c_exception" "complex_error(c_exception &)"
+    test_demangling_exact "lucid: complexfunc2__FPFPc_i" "complexfunc2(int (*)(char *))"
+    test_demangling_exact "lucid: complexfunc3__FPFPFPl_s_i" "complexfunc3(int (*)(short (*)(long *)))"
+
+    test_demangling_exact "lucid: complexfunc4__FPFPFPc_s_i" "complexfunc4(int (*)(short (*)(char *)))"
+    test_demangling_exact "lucid: complexfunc5__FPFPc_PFl_i" "complexfunc5(int (*(*)(char *))(long))"
+    test_demangling_exact "lucid: complexfunc6__FPFPi_PFl_i" "complexfunc6(int (*(*)(int *))(long))"
+    test_demangling_exact "lucid: complexfunc7__FPFPFPc_i_PFl_i" "complexfunc7(int (*(*)(int (*)(char *)))(long))"
+    test_demangling_exact "lucid: complicated_put__7ostreamFc" "ostream::complicated_put(char)"
+    test_demangling_exact "lucid: conv10__FlPc" "conv10(long, char *)"
+    test_demangling_exact "lucid: conv16__FUlPc" "conv16(unsigned long, char *)"
+    test_demangling_exact "lucid: dec__FR3ios" "dec(ios &)"
+    test_demangling_exact "lucid: dec__Fli" "dec(long, int)"
+    test_demangling_exact "lucid: dofield__FP7ostreamPciT2T3" "dofield(ostream *, char *, int, char *, int)"
+
+    test_demangling_exact "lucid: flags__3iosFl" "ios::flags(long)"
+    test_demangling_exact "lucid: flags__3iosFv" "ios::flags(void)"
+    test_demangling_exact "lucid: foo__FiN31" "foo(int, int, int, int)"
+    test_demangling_exact "lucid: foo__FiR3fooT1T2T1T2" "foo(int, foo &, int, foo &, int, foo &)"
+    test_demangling_exact "lucid: foo___3barFl" "bar::foo_(long)"
+    test_demangling "lucid: form__FPCce" "form\[(\]+(const char|char const) \[*\]+,...\[)\]+"
+    test_demangling_exact "lucid: get__7istreamFPcic" "istream::get(char *, int, char)"
+    test_demangling_exact "lucid: get__7istreamFR9streambufc" "istream::get(streambuf &, char)"
+    test_demangling_exact "lucid: get_complicated__7istreamFRUc" "istream::get_complicated(unsigned char &)"
+    test_demangling_exact "lucid: get_complicated__7istreamFRc" "istream::get_complicated(char &)"
+    test_demangling_exact "lucid: getline__7istreamFPUcic" "istream::getline(unsigned char *, int, char)"
+    test_demangling_exact "lucid: getline__7istreamFPcic" "istream::getline(char *, int, char)"
+
+    test_demangling_exact "lucid: ignore__7istreamFiT1" "istream::ignore(int, int)"
+    test_demangling_exact "lucid: init__12strstreambufFPciT1" "strstreambuf::init(char *, int, char *)"
+    test_demangling_exact "lucid: init__3iosFP9streambuf" "ios::init(streambuf *)"
+    test_demangling_exact "lucid: initcount__13Iostream_init" "Iostream_init::initcount"
+    test_demangling_exact "lucid: ipfx__7istreamFi" "istream::ipfx(int)"
+    test_demangling_exact "lucid: ls_complicated__7ostreamFUc" "ostream::ls_complicated(unsigned char)"
+    test_demangling_exact "lucid: ls_complicated__7ostreamFc" "ostream::ls_complicated(char)"
+    test_demangling "lucid: open__11fstreambaseFPCciT2" \
 	"fstreambase::open\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    gdb_test "maint dem open__7filebufFPCciT2" \
+    test_demangling "lucid: open__7filebufFPCciT2" \
 	"filebuf::open\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
 
-    gdb_test_exact "maint demangle overload1arg__FSc" "overload1arg(signed char)"
-    gdb_test_exact "maint demangle overload1arg__FUc" "overload1arg(unsigned char)"
-    gdb_test_exact "maint demangle overload1arg__FUi" "overload1arg(unsigned int)"
-    gdb_test_exact "maint demangle overload1arg__FUl" "overload1arg(unsigned long)"
-    gdb_test_exact "maint demangle overload1arg__FUs" "overload1arg(unsigned short)"
-    gdb_test_exact "maint demangle overload1arg__Fc" "overload1arg(char)"
-    gdb_test_exact "maint demangle overload1arg__Fd" "overload1arg(double)"
-    gdb_test_exact "maint demangle overload1arg__Ff" "overload1arg(float)"
-    gdb_test_exact "maint demangle overload1arg__Fi" "overload1arg(int)"
-    gdb_test_exact "maint demangle overload1arg__Fl" "overload1arg(long)"
-    gdb_test_exact "maint demangle overload1arg__Fs" "overload1arg(short)"
-    gdb_test_exact "maint demangle overload1arg__Fv" "overload1arg(void)"
-    gdb_test_exact "maint demangle overloadargs__FiN21" "overloadargs(int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__FiN31" "overloadargs(int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__FiN41" "overloadargs(int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__FiN51" "overloadargs(int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__FiN61" "overloadargs(int, int, int, int, int, int, int)"
-
-    gdb_test_exact "maint demangle overloadargs__FiN71" "overloadargs(int, int, int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__FiN81" "overloadargs(int, int, int, int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__FiN91" "overloadargs(int, int, int, int, int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__FiN91N11" "overloadargs(int, int, int, int, int, int, int, int, int, int, int)"
-    gdb_test_exact "maint demangle overloadargs__FiT1" "overloadargs(int, int)"
-    gdb_test_exact "maint demangle polar__FdT1" "polar(double, double)"
-    gdb_test_exact "maint demangle pow__F7complexT1" "pow(complex, complex)"
-    gdb_test_exact "maint demangle pow__F7complexd" "pow(complex, double)"
-    gdb_test_exact "maint demangle pow__F7complexi" "pow(complex, int)"
-    gdb_test_exact "maint demangle pow__Fd7complex" "pow(double, complex)"
-    gdb_test_exact "maint demangle pstart__FPciT2" "pstart(char *, int, int)"
-    gdb_test_exact "maint demangle put__7ostreamFc" "ostream::put(char)"
-
-    gdb_test_exact "maint demangle read__7istreamFPci" "istream::read(char *, int)"
-    gdb_test_exact "maint demangle resetiosflags__FR3iosl" "resetiosflags(ios &, long)"
-    gdb_test_exact "maint demangle restore_errno__FRi" "restore_errno(int &)"
-    gdb_test_exact "maint demangle rs_complicated__7istreamFRUc" "istream::rs_complicated(unsigned char &)"
-    gdb_test_exact "maint demangle rs_complicated__7istreamFRc" "istream::rs_complicated(char &)"
-    gdb_test_exact "maint demangle seekg__7istreamFl8seek_dir" "istream::seekg(long, seek_dir)"
-    gdb_test_exact "maint demangle seekoff__12strstreambufFl8seek_diri" "strstreambuf::seekoff(long, seek_dir, int)"
-    gdb_test_exact "maint demangle seekoff__9streambufFlQ2_3ios12ios_seek_diri" "streambuf::seekoff(long, ios::ios_seek_dir, int)"
-    gdb_test_exact "maint demangle seekpos__9streambufFli" "streambuf::seekpos(long, int)"
-    gdb_test_exact "maint demangle set_new_handler__FPFv_v" "set_new_handler(void (*)(void))"
-    gdb_test_exact "maint demangle setb__9streambufFPcT1i" "streambuf::setb(char *, char *, int)"
-
-    gdb_test_exact "maint demangle setb__FR3iosi" "setb(ios &, int)"
-    gdb_test_exact "maint demangle setbuf__11fstreambaseFPci" "fstreambase::setbuf(char *, int)"
-    gdb_test_exact "maint demangle setbuf__9streambufFPUci" "streambuf::setbuf(unsigned char *, int)"
-    gdb_test_exact "maint demangle setbuf__9streambufFPciT2" "streambuf::setbuf(char *, int, int)"
-    gdb_test_exact "maint demangle setf__3iosFlT1" "ios::setf(long, long)"
-    gdb_test_exact "maint demangle setfill__FR3iosi" "setfill(ios &, int)"
-    gdb_test_exact "maint demangle setg__9streambufFPcN21" "streambuf::setg(char *, char *, char *)"
-    gdb_test_exact "maint demangle setp__9streambufFPcT1" "streambuf::setp(char *, char *)"
-
-    gdb_test "maint dem sputn__9streambufFPCci" \
+    test_demangling_exact "lucid: overload1arg__FSc" "overload1arg(signed char)"
+    test_demangling_exact "lucid: overload1arg__FUc" "overload1arg(unsigned char)"
+    test_demangling_exact "lucid: overload1arg__FUi" "overload1arg(unsigned int)"
+    test_demangling_exact "lucid: overload1arg__FUl" "overload1arg(unsigned long)"
+    test_demangling_exact "lucid: overload1arg__FUs" "overload1arg(unsigned short)"
+    test_demangling_exact "lucid: overload1arg__Fc" "overload1arg(char)"
+    test_demangling_exact "lucid: overload1arg__Fd" "overload1arg(double)"
+    test_demangling_exact "lucid: overload1arg__Ff" "overload1arg(float)"
+    test_demangling_exact "lucid: overload1arg__Fi" "overload1arg(int)"
+    test_demangling_exact "lucid: overload1arg__Fl" "overload1arg(long)"
+    test_demangling_exact "lucid: overload1arg__Fs" "overload1arg(short)"
+    test_demangling_exact "lucid: overload1arg__Fv" "overload1arg(void)"
+    test_demangling_exact "lucid: overloadargs__FiN21" "overloadargs(int, int, int)"
+    test_demangling_exact "lucid: overloadargs__FiN31" "overloadargs(int, int, int, int)"
+    test_demangling_exact "lucid: overloadargs__FiN41" "overloadargs(int, int, int, int, int)"
+    test_demangling_exact "lucid: overloadargs__FiN51" "overloadargs(int, int, int, int, int, int)"
+    test_demangling_exact "lucid: overloadargs__FiN61" "overloadargs(int, int, int, int, int, int, int)"
+
+    test_demangling_exact "lucid: overloadargs__FiN71" "overloadargs(int, int, int, int, int, int, int, int)"
+    test_demangling_exact "lucid: overloadargs__FiN81" "overloadargs(int, int, int, int, int, int, int, int, int)"
+    test_demangling_exact "lucid: overloadargs__FiN91" "overloadargs(int, int, int, int, int, int, int, int, int, int)"
+    test_demangling_exact "lucid: overloadargs__FiN91N11" "overloadargs(int, int, int, int, int, int, int, int, int, int, int)"
+    test_demangling_exact "lucid: overloadargs__FiT1" "overloadargs(int, int)"
+    test_demangling_exact "lucid: polar__FdT1" "polar(double, double)"
+    test_demangling_exact "lucid: pow__F7complexT1" "pow(complex, complex)"
+    test_demangling_exact "lucid: pow__F7complexd" "pow(complex, double)"
+    test_demangling_exact "lucid: pow__F7complexi" "pow(complex, int)"
+    test_demangling_exact "lucid: pow__Fd7complex" "pow(double, complex)"
+    test_demangling_exact "lucid: pstart__FPciT2" "pstart(char *, int, int)"
+    test_demangling_exact "lucid: put__7ostreamFc" "ostream::put(char)"
+
+    test_demangling_exact "lucid: read__7istreamFPci" "istream::read(char *, int)"
+    test_demangling_exact "lucid: resetiosflags__FR3iosl" "resetiosflags(ios &, long)"
+    test_demangling_exact "lucid: restore_errno__FRi" "restore_errno(int &)"
+    test_demangling_exact "lucid: rs_complicated__7istreamFRUc" "istream::rs_complicated(unsigned char &)"
+    test_demangling_exact "lucid: rs_complicated__7istreamFRc" "istream::rs_complicated(char &)"
+    test_demangling_exact "lucid: seekg__7istreamFl8seek_dir" "istream::seekg(long, seek_dir)"
+    test_demangling_exact "lucid: seekoff__12strstreambufFl8seek_diri" "strstreambuf::seekoff(long, seek_dir, int)"
+    test_demangling_exact "lucid: seekoff__9streambufFlQ2_3ios12ios_seek_diri" "streambuf::seekoff(long, ios::ios_seek_dir, int)"
+    test_demangling_exact "lucid: seekpos__9streambufFli" "streambuf::seekpos(long, int)"
+    test_demangling_exact "lucid: set_new_handler__FPFv_v" "set_new_handler(void (*)(void))"
+    test_demangling_exact "lucid: setb__9streambufFPcT1i" "streambuf::setb(char *, char *, int)"
+
+    test_demangling_exact "lucid: setb__FR3iosi" "setb(ios &, int)"
+    test_demangling_exact "lucid: setbuf__11fstreambaseFPci" "fstreambase::setbuf(char *, int)"
+    test_demangling_exact "lucid: setbuf__9streambufFPUci" "streambuf::setbuf(unsigned char *, int)"
+    test_demangling_exact "lucid: setbuf__9streambufFPciT2" "streambuf::setbuf(char *, int, int)"
+    test_demangling_exact "lucid: setf__3iosFlT1" "ios::setf(long, long)"
+    test_demangling_exact "lucid: setfill__FR3iosi" "setfill(ios &, int)"
+    test_demangling_exact "lucid: setg__9streambufFPcN21" "streambuf::setg(char *, char *, char *)"
+    test_demangling_exact "lucid: setp__9streambufFPcT1" "streambuf::setp(char *, char *)"
+
+    test_demangling "lucid: sputn__9streambufFPCci" \
 	"streambuf::sputn\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    gdb_test "maint dem str__FPCci" \
+    test_demangling "lucid: str__FPCci" \
 	"str\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    gdb_test_exact "maint demangle tie__3iosFP7ostream" "ios::tie(ostream *)"
-    gdb_test_exact "maint demangle uconv10__FUlPc" "uconv10(unsigned long, char *)"
+    test_demangling_exact "lucid: tie__3iosFP7ostream" "ios::tie(ostream *)"
+    test_demangling_exact "lucid: uconv10__FUlPc" "uconv10(unsigned long, char *)"
 
-    gdb_test "maint dem write__7ostreamFPCci" \
+    test_demangling "lucid: write__7ostreamFPCci" \
 	"ostream::write\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    gdb_test_exact "maint demangle xget__7istreamFPc" "istream::xget(char *)"
-    gdb_test_exact "maint demangle xsgetn__9streambufFPci" "streambuf::xsgetn(char *, int)"
-    gdb_test "maint dem xsputn__9streambufFPCci" \
+    test_demangling_exact "lucid: xget__7istreamFPc" "istream::xget(char *)"
+    test_demangling_exact "lucid: xsgetn__9streambufFPci" "streambuf::xsgetn(char *, int)"
+    test_demangling "lucid: xsputn__9streambufFPCci" \
 	"streambuf::xsputn\[(\]+(const char|char const) \[*\]+, int\[)\]+"
+
+    test_demangling_exact "lucid: _Utf390_1__1_9223372036854775807__9223372036854775" \
+	    "Can't demangle \"_Utf390_1__1_9223372036854775807__9223372036854775\""
 }
 
 #
@@ -731,759 +798,732 @@ proc test_lucid_style_demangling {} {
 #
 
 proc test_arm_style_demangling {} {
-    global gdb_prompt
-
-    # Set the demangling style to "arm" and then check to make sure
-    # it really got set.  Return if the style failed to get set for
-    # some reason.
-
-    send_gdb "set demangle-style arm\n"
-    gdb_expect {
-	-re "set demangle-style arm\[\r\n\]+$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" { fail "set demangle-style arm failed" ; return }
-	timeout { fail "set demangle-style arm failed (timeout)" ; return }
-    }
-
-    send_gdb "show demangle-style\n"
-    gdb_expect {
-	-re "The current C\[+\]+ demangling style is \"arm\".\r\n$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" { fail "demangling style not set to arm" }
-	timeout { fail "show demangle-style timed out" }
-    }
-
-    gdb_test_exact "maint demangle __dt__21T5__pt__11_PFiPPdPv_iFv" "T5<int (*)(int, double **, void *)>::~T5(void)"
+    test_demangling_exact "arm: __dt__21T5__pt__11_PFiPPdPv_iFv" "T5<int (*)(int, double **, void *)>::~T5(void)"
 
-    gdb_test_exact "maint demangle __ct__1cFi" "c::c(int)"
+    test_demangling_exact "arm: __ct__1cFi" "c::c(int)"
 
-    gdb_test_exact "maint demangle __dt__11T5__pt__2_iFv" "T5<int>::~T5(void)"
+    test_demangling_exact "arm: __dt__11T5__pt__2_iFv" "T5<int>::~T5(void)"
 
-    gdb_test_exact "maint demangle __dt__11T5__pt__2_cFv" "T5<char>::~T5(void)"
+    test_demangling_exact "arm: __dt__11T5__pt__2_cFv" "T5<char>::~T5(void)"
 
-    gdb_test_exact "maint demangle __ct__2T2Fi" "T2::T2(int)"
-    gdb_test_exact "maint demangle __dt__2T1Fv" "T1::~T1(void)"
+    test_demangling_exact "arm: __ct__2T2Fi" "T2::T2(int)"
+    test_demangling_exact "arm: __dt__2T1Fv" "T1::~T1(void)"
 
-    gdb_test_exact "maint demangle __dt__12T5__pt__3_1xFv" "T5<x>::~T5(void)"
+    test_demangling_exact "arm: __dt__12T5__pt__3_1xFv" "T5<x>::~T5(void)"
 
-    gdb_test_exact "maint demangle __dt__17T5__pt__8_PFcPv_iFv" "T5<int (*)(char, void *)>::~T5(void)"
+    test_demangling_exact "arm: __dt__17T5__pt__8_PFcPv_iFv" "T5<int (*)(char, void *)>::~T5(void)"
 
-    gdb_test "maint dem g__FP1cPC1cT1" \
+    test_demangling "arm: g__FP1cPC1cT1" \
 	"g\[(\]+c *\[*\]+, (const c|c const) *\[*\]+, c *\[*\]+\[)\]+"
-    gdb_test "maint dem g__FPUlPCUlT1" \
+    test_demangling "arm: g__FPUlPCUlT1" \
 	"g\[(\]+unsigned long \[*\]+, (const unsigned long|unsigned long const) \[*\]+, unsigned long \[*\]+\[)\]+"
-    gdb_test "maint dem g__FPUiPCUiT1" \
+    test_demangling "arm: g__FPUiPCUiT1" \
 	"g\[(\]+unsigned int \[*\]+, (const unsigned int|unsigned int const) \[*\]+, unsigned int \[*\]+\[)\]+"
-    gdb_test "maint dem g__FPUsPCUsT1" \
+    test_demangling "arm: g__FPUsPCUsT1" \
 	"g\[(\]+unsigned short \[*\]+, (const unsigned short|unsigned short const) \[*\]+, unsigned short \[*\]+\[)\]+"
-    gdb_test "maint dem g__FPUcPCUcT1" \
+    test_demangling "arm: g__FPUcPCUcT1" \
 	"g\[(\]+unsigned char \[*\]+, (const unsigned char|unsigned char const) \[*\]+, unsigned char \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1TPlPClT2" \
+    test_demangling "arm: g__F1TPlPClT2" \
 	"g\[(\]+T, long \[*\]+, (const long|long const) \[*\]+, long \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1RRlRClT2" \
+    test_demangling "arm: g__F1RRlRClT2" \
 	"g\[(\]+R, long &, (const long|long const) &, long &\[)\]+"
-    gdb_test "maint dem g__F1TPiPCiT2" \
+    test_demangling "arm: g__F1TPiPCiT2" \
 	"g\[(\]+T, int \[*\]+, (const int|int const) \[*\]+, int \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1RRiRCiT2" \
+    test_demangling "arm: g__F1RRiRCiT2" \
 	"g\[(\]+R, int &, (const int|int const) &, int &\[)\]+"
-    gdb_test "maint dem g__F1TPsPCsT2" \
+    test_demangling "arm: g__F1TPsPCsT2" \
 	"g\[(\]+T, short \[*\]+, (const short|short const) \[*\]+, short \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1RRsRCsT2" \
+    test_demangling "arm: g__F1RRsRCsT2" \
 	"g\[(\]+R, short &, (const short|short const) &, short &\[)\]+"
-    gdb_test "maint dem g__F1TPcPCcT2" \
+    test_demangling "arm: g__F1TPcPCcT2" \
 	"g\[(\]+T, char \[*\]+, (const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1RRcRCcT2" \
+    test_demangling "arm: g__F1RRcRCcT2" \
 	"g\[(\]+R, char &, (const char|char const) &, char &\[)\]+"
 
-    gdb_test_exact "maint demangle __ct__21T5__pt__11_PFiPPdPv_iFi" "T5<int (*)(int, double **, void *)>::T5(int)"
+    test_demangling_exact "arm: __ct__21T5__pt__11_PFiPPdPv_iFi" "T5<int (*)(int, double **, void *)>::T5(int)"
 
-    gdb_test "maint dem __gt__FRC2T2c" \
+    test_demangling "arm: __gt__FRC2T2c" \
 	"operator>\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test "maint dem __ge__FRC2T2c" \
+    test_demangling "arm: __ge__FRC2T2c" \
 	"operator>=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test "maint dem __lt__FRC2T2c" \
+    test_demangling "arm: __lt__FRC2T2c" \
 	"operator<\[(\]+(const T2|T2 const) &, char\[)\]+"
 
-    gdb_test "maint dem __le__FRC2T2c" \
+    test_demangling "arm: __le__FRC2T2c" \
 	"operator<=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test "maint dem __ne__FRC2T2c" \
+    test_demangling "arm: __ne__FRC2T2c" \
 	"operator!=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test "maint dem __eq__FRC2T2c" \
+    test_demangling "arm: __eq__FRC2T2c" \
 	"operator==\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test_exact "maint demangle __amd__FR2T2i" "operator%=(T2 &, int)"
-    gdb_test_exact "maint demangle __adv__FR2T2i" "operator/=(T2 &, int)"
-    gdb_test_exact "maint demangle __amu__FR2T2i" "operator*=(T2 &, int)"
-    gdb_test_exact "maint demangle __ami__FR2T2i" "operator-=(T2 &, int)"
-    gdb_test_exact "maint demangle __apl__FR2T2i" "operator+=(T2 &, int)"
-    gdb_test_exact "maint demangle __nw__2T1SFUi" "T1::operator new(unsigned int) static"
-    gdb_test_exact "maint demangle __dl__2T1SFPv" "T1::operator delete(void *) static"
-    gdb_test_exact "maint demangle put__2T7SFi" "T7::put(int) static"
-
-    gdb_test_exact "maint demangle __dl__12T5__pt__3_1xSFPv" "T5<x>::operator delete(void *) static"
-
-    gdb_test_exact "maint demangle h__FUc" "h(unsigned char)"
-    gdb_test_exact "maint demangle f__Fic" "f(int, char)"
-    gdb_test_exact "maint demangle h__FUi" "h(unsigned int)"
-    gdb_test_exact "maint demangle h__Fci" "h(char, int)"
-    gdb_test_exact "maint demangle h__FUl" "h(unsigned long)"
-    gdb_test_exact "maint demangle h__Fcl" "h(char, long)"
-    gdb_test_exact "maint demangle h__FUs" "h(unsigned short)"
-    gdb_test_exact "maint demangle h__Fcs" "h(char, short)"
-    gdb_test "maint dem __amd__FR2T2RC2T2" \
+    test_demangling_exact "arm: __amd__FR2T2i" "operator%=(T2 &, int)"
+    test_demangling_exact "arm: __adv__FR2T2i" "operator/=(T2 &, int)"
+    test_demangling_exact "arm: __amu__FR2T2i" "operator*=(T2 &, int)"
+    test_demangling_exact "arm: __ami__FR2T2i" "operator-=(T2 &, int)"
+    test_demangling_exact "arm: __apl__FR2T2i" "operator+=(T2 &, int)"
+    test_demangling_exact "arm: __nw__2T1SFUi" "T1::operator new(unsigned int) static"
+    test_demangling_exact "arm: __dl__2T1SFPv" "T1::operator delete(void *) static"
+    test_demangling_exact "arm: put__2T7SFi" "T7::put(int) static"
+
+    test_demangling_exact "arm: __dl__12T5__pt__3_1xSFPv" "T5<x>::operator delete(void *) static"
+
+    test_demangling_exact "arm: h__FUc" "h(unsigned char)"
+    test_demangling_exact "arm: f__Fic" "f(int, char)"
+    test_demangling_exact "arm: h__FUi" "h(unsigned int)"
+    test_demangling_exact "arm: h__Fci" "h(char, int)"
+    test_demangling_exact "arm: h__FUl" "h(unsigned long)"
+    test_demangling_exact "arm: h__Fcl" "h(char, long)"
+    test_demangling_exact "arm: h__FUs" "h(unsigned short)"
+    test_demangling_exact "arm: h__Fcs" "h(char, short)"
+    test_demangling "arm: __amd__FR2T2RC2T2" \
 	"operator%=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __adv__FR2T2RC2T2" \
+    test_demangling "arm: __adv__FR2T2RC2T2" \
 	"operator/=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __amu__FR2T2RC2T2" \
+    test_demangling "arm: __amu__FR2T2RC2T2" \
 	"operator\[*\]+=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __ami__FR2T2RC2T2" \
+    test_demangling "arm: __ami__FR2T2RC2T2" \
 	"operator-=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __apl__FR2T2RC2T2" \
+    test_demangling "arm: __apl__FR2T2RC2T2" \
 	"operator\[+\]+=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
 
-    gdb_test "maint dem g__F1SRPUlRPCUlT2" \
+    test_demangling "arm: g__F1SRPUlRPCUlT2" \
 	"g\[(\]+S, unsigned long \[*\]+&, (const unsigned long|unsigned long const) \[*\]+&, unsigned long \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1SRPUiRPCUiT2" \
+    test_demangling "arm: g__F1SRPUiRPCUiT2" \
 	"g\[(\]+S, unsigned int \[*\]+&, (const unsigned int|unsigned int const) \[*\]+&, unsigned int \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1SRPUsRPCUsT2" \
+    test_demangling "arm: g__F1SRPUsRPCUsT2" \
 	"g\[(\]+S, unsigned short \[*\]+&, (const unsigned short|unsigned short const) \[*\]+&, unsigned short \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1SRPUcRPCUcT2" \
+    test_demangling "arm: g__F1SRPUcRPCUcT2" \
 	"g\[(\]+S, unsigned char \[*\]+&, (const unsigned char|unsigned char const) \[*\]+&, unsigned char \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1T1SRPlRPClT3" \
+    test_demangling "arm: g__F1T1SRPlRPClT3" \
 	"g\[(\]+T, S, long \[*\]+&, (const long|long const) \[*\]+&, long \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1T1SRPiRPCiT3" \
+    test_demangling "arm: g__F1T1SRPiRPCiT3" \
 	"g\[(\]+T, S, int \[*\]+&, (const int|int const) \[*\]+&, int \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1T1SRPcRPCcT3" \
+    test_demangling "arm: g__F1T1SRPcRPCcT3" \
 	"g\[(\]+T, S, char \[*\]+&, (const char|char const) \[*\]+&, char \[*\]+&\[)\]+"
 
-    gdb_test_exact "maint demangle X__12T5__pt__3_1x" "T5<x>::X"
+    test_demangling_exact "arm: X__12T5__pt__3_1x" "T5<x>::X"
 
-    gdb_test_exact "maint demangle __ct__11T5__pt__2_iFi" "T5<int>::T5(int)"
+    test_demangling_exact "arm: __ct__11T5__pt__2_iFi" "T5<int>::T5(int)"
 
-    gdb_test_exact "maint demangle __ct__11T5__pt__2_cFi" "T5<char>::T5(int)"
+    test_demangling_exact "arm: __ct__11T5__pt__2_cFi" "T5<char>::T5(int)"
 
-    gdb_test "maint dem __gt__FRC2T2T1" \
+    test_demangling "arm: __gt__FRC2T2T1" \
 	"operator>\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __ge__FRC2T2T1" \
+    test_demangling "arm: __ge__FRC2T2T1" \
 	"operator>=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __lt__FRC2T2T1" \
+    test_demangling "arm: __lt__FRC2T2T1" \
 	"operator<\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __le__FRC2T2T1" \
+    test_demangling "arm: __le__FRC2T2T1" \
 	"operator<=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __ne__FRC2T2T1" \
+    test_demangling "arm: __ne__FRC2T2T1" \
 	"operator!=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __eq__FRC2T2T1" \
+    test_demangling "arm: __eq__FRC2T2T1" \
 	"operator==\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem g__FcR1cRC1cT2" \
+    test_demangling "arm: g__FcR1cRC1cT2" \
 	"g\[(\]+char, c &, (const c|c const) &, c &\[)\]+"
-    gdb_test "maint dem g__FcRPdRPCdT2" \
+    test_demangling "arm: g__FcRPdRPCdT2" \
 	"g\[(\]+char, double *\[*\]+&, (const double|double const) *\[*\]+&, double *\[*\]+&\[)\]+"
-    gdb_test "maint dem g__FcRPfRPCfT2" \
+    test_demangling "arm: g__FcRPfRPCfT2" \
 	"g\[(\]+char, float *\[*\]+&, (const float|float const) *\[*\]+&, float *\[*\]+&\[)\]+"
-    gdb_test_exact "maint demangle h__FcT1" "h(char, char)"
-    gdb_test_exact "maint demangle f__Ficd" "f(int, char, double)"
-    gdb_test "maint dem g__F1T1SdRPsRPCsT4" \
+    test_demangling_exact "arm: h__FcT1" "h(char, char)"
+    test_demangling_exact "arm: f__Ficd" "f(int, char, double)"
+    test_demangling "arm: g__F1T1SdRPsRPCsT4" \
 	"g\[(\]+T, S, double, short \[*\]+&, (const short|short const) \[*\]+&, short \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1cC1cT1" \
+    test_demangling "arm: g__F1cC1cT1" \
 	"g\[(\]+c, (const c|c const), c\[)\]+"
-    gdb_test "maint dem g__FPdPCdT1" \
+    test_demangling "arm: g__FPdPCdT1" \
 	"g\[(\]+double *\[*\]+, (const double|double const) *\[*\]+, double *\[*\]+\[)\]+"
-    gdb_test "maint dem g__FPfPCfT1" \
+    test_demangling "arm: g__FPfPCfT1" \
 	"g\[(\]+float *\[*\]+, (const float|float const) *\[*\]+, float *\[*\]+\[)\]+"
 
-    gdb_test "maint dem g__FUlCUlT1" \
+    test_demangling "arm: g__FUlCUlT1" \
 	"g\[(\]+unsigned long, (const unsigned long|unsigned long const), unsigned long\[)\]+"
-    gdb_test "maint dem g__FPlPClT1" \
+    test_demangling "arm: g__FPlPClT1" \
 	"g\[(\]+long \[*\]+, (const long|long const) \[*\]+, long \[*\]+\[)\]+"
-    gdb_test "maint dem g__FUiCUiT1" \
+    test_demangling "arm: g__FUiCUiT1" \
 	"g\[(\]+unsigned int, (const unsigned int|unsigned int const), unsigned int\[)\]+"
-    gdb_test "maint dem g__FPiPCiT1" \
+    test_demangling "arm: g__FPiPCiT1" \
 	"g\[(\]+int \[*\]+, (const int|int const) \[*\]+, int \[*\]+\[)\]+"
-    gdb_test "maint dem g__FUsCUsT1" \
+    test_demangling "arm: g__FUsCUsT1" \
 	"g\[(\]+unsigned short, (const unsigned short|unsigned short const), unsigned short\[)\]+"
-    gdb_test "maint dem g__FPsPCsT1" \
+    test_demangling "arm: g__FPsPCsT1" \
 	"g\[(\]+short \[*\]+, (const short|short const) \[*\]+, short \[*\]+\[)\]+"
-    gdb_test "maint dem g__FUcCUcT1" \
+    test_demangling "arm: g__FUcCUcT1" \
 	"g\[(\]+unsigned char, (const unsigned char|unsigned char const), unsigned char\[)\]+"
-    gdb_test "maint dem g__FPcPCcT1" \
+    test_demangling "arm: g__FPcPCcT1" \
 	"g\[(\]+char \[*\]+, (const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1TlClT2" \
+    test_demangling "arm: g__F1TlClT2" \
 	"g\[(\]+T, long, (const long|long const), long\[)\]+"
-    gdb_test "maint dem g__F1TiCiT2" \
+    test_demangling "arm: g__F1TiCiT2" \
 	"g\[(\]+T, int, (const int|int const), int\[)\]+"
-    gdb_test "maint dem g__F1TsCsT2" \
+    test_demangling "arm: g__F1TsCsT2" \
 	"g\[(\]+T, short, (const short|short const), short\[)\]+"
-    gdb_test "maint dem g__F1TcCcT2" \
+    test_demangling "arm: g__F1TcCcT2" \
 	"g\[(\]+T, char, (const char|char const), char\[)\]+"
 
-    gdb_test_exact "maint demangle __dl__17T5__pt__8_PFcPv_iSFPv" "T5<int (*)(char, void *)>::operator delete(void *) static"
+    test_demangling_exact "arm: __dl__17T5__pt__8_PFcPv_iSFPv" "T5<int (*)(char, void *)>::operator delete(void *) static"
 
-    gdb_test "maint dem printf__FPCce" \
+    test_demangling "arm: printf__FPCce" \
 	"printf\[(\]+(const char|char const) \[*\]+,...\[)\]+"
 
-    gdb_test_exact "maint demangle X__17T5__pt__8_PFcPv_i" "T5<int (*)(char, void *)>::X"
+    test_demangling_exact "arm: X__17T5__pt__8_PFcPv_i" "T5<int (*)(char, void *)>::X"
 
-    gdb_test_exact "maint demangle __ct__12T5__pt__3_1xFi" "T5<x>::T5(int)"
+    test_demangling_exact "arm: __ct__12T5__pt__3_1xFi" "T5<x>::T5(int)"
 
-    gdb_test "maint dem g__F1SRUlRCUlT2" \
+    test_demangling "arm: g__F1SRUlRCUlT2" \
 	"g\[(\]+S, unsigned long &, (const unsigned long|unsigned long const) &, unsigned long &\[)\]+"
-    gdb_test "maint dem g__F1SRPlRPClT2" \
+    test_demangling "arm: g__F1SRPlRPClT2" \
 	"g\[(\]+S, long \[*\]+&, (const long|long const) \[*\]+&, long \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1RRUiRCUiT2" \
+    test_demangling "arm: g__F1RRUiRCUiT2" \
 	"g\[(\]+R, unsigned int &, (const unsigned int|unsigned int const) &, unsigned int &\[)\]+"
-    gdb_test "maint dem g__F1SRPiRPCiT2" \
+    test_demangling "arm: g__F1SRPiRPCiT2" \
 	"g\[(\]+S, int \[*\]+&, (const int|int const) \[*\]+&, int \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1RRUsRCUsT2" \
+    test_demangling "arm: g__F1RRUsRCUsT2" \
 	"g\[(\]+R, unsigned short &, (const unsigned short|unsigned short const) &, unsigned short &\[)\]+"
-    gdb_test "maint dem g__F1SRPsRPCsT2" \
+    test_demangling "arm: g__F1SRPsRPCsT2" \
 	"g\[(\]+S, short \[*\]+&, (const short|short const) \[*\]+&, short \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1RRUcRCUcT2" \
+    test_demangling "arm: g__F1RRUcRCUcT2" \
 	"g\[(\]+R, unsigned char &, (const unsigned char|unsigned char const) &, unsigned char &\[)\]+"
-    gdb_test "maint dem g__F1SRPcRPCcT2" \
+    test_demangling "arm: g__F1SRPcRPCcT2" \
 	"g\[(\]+S, char \[*\]+&, (const char|char const) \[*\]+&, char \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1T1RRlRClT3" \
+    test_demangling "arm: g__F1T1RRlRClT3" \
 	"g\[(\]+T, R, long &, (const long|long const) &, long &\[)\]+"
-    gdb_test "maint dem g__F1T1RRiRCiT3" \
+    test_demangling "arm: g__F1T1RRiRCiT3" \
 	"g\[(\]+T, R, int &, (const int|int const) &, int &\[)\]+"
-    gdb_test "maint dem g__F1T1RRsRCsT3" \
+    test_demangling "arm: g__F1T1RRsRCsT3" \
 	"g\[(\]+T, R, short &, (const short|short const) &, short &\[)\]+"
-    gdb_test "maint dem g__F1T1RRcRCcT3" \
+    test_demangling "arm: g__F1T1RRcRCcT3" \
 	"g\[(\]+T, R, char &, (const char|char const) &, char &\[)\]+"
 
-    gdb_test_exact "maint demangle __dl__21T5__pt__11_PFiPPdPv_iSFPv" "T5<int (*)(int, double **, void *)>::operator delete(void *) static"
+    test_demangling_exact "arm: __dl__21T5__pt__11_PFiPPdPv_iSFPv" "T5<int (*)(int, double **, void *)>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle __std__foo" "global destructors keyed to foo"
+    test_demangling_exact "arm: __std__foo" "global destructors keyed to foo"
 
-    gdb_test_exact "maint demangle __sti__bar" "global constructors keyed to bar"
+    test_demangling_exact "arm: __sti__bar" "global constructors keyed to bar"
 
-    gdb_test_exact "maint demangle f__FicdPcPFci_v" "f(int, char, double, char *, void (*)(char, int))"
-    gdb_test_exact "maint demangle f__FicdPcPFic_v" "f(int, char, double, char *, void (*)(int, char))"
-    gdb_test_exact "maint demangle get__2T7SFv" "T7::get(void) static"
+    test_demangling_exact "arm: f__FicdPcPFci_v" "f(int, char, double, char *, void (*)(char, int))"
+    test_demangling_exact "arm: f__FicdPcPFic_v" "f(int, char, double, char *, void (*)(int, char))"
+    test_demangling_exact "arm: get__2T7SFv" "T7::get(void) static"
 
-    gdb_test_exact "maint demangle X__21T5__pt__11_PFiPPdPv_i" "T5<int (*)(int, double **, void *)>::X"
+    test_demangling_exact "arm: X__21T5__pt__11_PFiPPdPv_i" "T5<int (*)(int, double **, void *)>::X"
 
-    gdb_test "maint dem g__FcRdRCdT2" \
+    test_demangling "arm: g__FcRdRCdT2" \
 	"g\[(\]+char, double &, (const double|double const) &, double &\[)\]+"
-    gdb_test "maint dem g__FcRfRCfT2" \
+    test_demangling "arm: g__FcRfRCfT2" \
 	"g\[(\]+char, float &, (const float|float const) &, float &\[)\]+"
-    gdb_test "maint dem __md__FC2T2i" \
+    test_demangling "arm: __md__FC2T2i" \
 	"operator%\[(\]+(const T2|T2 const), int\[)\]+"
-    gdb_test "maint dem __dv__FC2T2i" \
+    test_demangling "arm: __dv__FC2T2i" \
 	"operator/\[(\]+(const T2|T2 const), int\[)\]+"
-    gdb_test "maint dem __ml__FC2T2i" \
+    test_demangling "arm: __ml__FC2T2i" \
 	"operator\[*\]+\[(\]+(const T2|T2 const), int\[)\]+"
-    gdb_test "maint dem __mi__FC2T2i" \
+    test_demangling "arm: __mi__FC2T2i" \
 	"operator-\[(\]+(const T2|T2 const), int\[)\]+"
-    gdb_test "maint dem __pl__FC2T2i" \
+    test_demangling "arm: __pl__FC2T2i" \
 	"operator\[+\]+\[(\]+(const T2|T2 const), int\[)\]+"
 
-    gdb_test_exact "maint demangle __dl__11T5__pt__2_iSFPv" "T5<int>::operator delete(void *) static"
+    test_demangling_exact "arm: __dl__11T5__pt__2_iSFPv" "T5<int>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle __dl__11T5__pt__2_cSFPv" "T5<char>::operator delete(void *) static"
+    test_demangling_exact "arm: __dl__11T5__pt__2_cSFPv" "T5<char>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle h__Fc" "h(char)"
-    gdb_test_exact "maint demangle h__Fd" "h(double)"
-    gdb_test_exact "maint demangle h__Ff" "h(float)"
-    gdb_test_exact "maint demangle h__Fi" "h(int)"
-    gdb_test_exact "maint demangle f__Fi" "f(int)"
-    gdb_test_exact "maint demangle h__Fl" "h(long)"
+    test_demangling_exact "arm: h__Fc" "h(char)"
+    test_demangling_exact "arm: h__Fd" "h(double)"
+    test_demangling_exact "arm: h__Ff" "h(float)"
+    test_demangling_exact "arm: h__Fi" "h(int)"
+    test_demangling_exact "arm: f__Fi" "f(int)"
+    test_demangling_exact "arm: h__Fl" "h(long)"
 
-    gdb_test_exact "maint demangle h__Fs" "h(short)"
-    gdb_test "maint dem __md__FC2T2RC2T2" \
+    test_demangling_exact "arm: h__Fs" "h(short)"
+    test_demangling "arm: __md__FC2T2RC2T2" \
 	"operator%\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __dv__FC2T2RC2T2" \
+    test_demangling "arm: __dv__FC2T2RC2T2" \
 	"operator/\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __ml__FC2T2RC2T2" \
+    test_demangling "arm: __ml__FC2T2RC2T2" \
 	"operator\[*\]+\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __mi__FC2T2RC2T2" \
+    test_demangling "arm: __mi__FC2T2RC2T2" \
 	"operator-\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __pl__FC2T2RC2T2" \
+    test_demangling "arm: __pl__FC2T2RC2T2" \
 	"operator\[+\]+\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem g__FcRP1cRPC1cT2" \
+    test_demangling "arm: g__FcRP1cRPC1cT2" \
 	"g\[(\]+char, c *\[*\]+&, (const c|c const) *\[*\]+&, c *\[*\]+&\[)\]+"
 
-    gdb_test_exact "maint demangle X__11T5__pt__2_c" "T5<char>::X"
+    test_demangling_exact "arm: X__11T5__pt__2_c" "T5<char>::X"
 
-    gdb_test_exact "maint demangle X__11T5__pt__2_i" "T5<int>::X"
+    test_demangling_exact "arm: X__11T5__pt__2_i" "T5<int>::X"
 
-    gdb_test "maint dem g__FdCdT1" \
+    test_demangling "arm: g__FdCdT1" \
 	"g\[(\]+double, (const double|double const), double\[)\]+"
-    gdb_test "maint dem g__FfCfT1" \
+    test_demangling "arm: g__FfCfT1" \
 	"g\[(\]+float, (const float|float const), float\[)\]+"
-    gdb_test "maint dem g__FlClT1" \
+    test_demangling "arm: g__FlClT1" \
 	"g\[(\]+long, (const long|long const), long\[)\]+"
-    gdb_test "maint dem g__FiCiT1" \
+    test_demangling "arm: g__FiCiT1" \
 	"g\[(\]+int, (const int|int const), int\[)\]+"
-    gdb_test "maint dem g__FsCsT1" \
+    test_demangling "arm: g__FsCsT1" \
 	"g\[(\]+short, (const short|short const), short\[)\]+"
-    gdb_test "maint dem g__FcCcT1" \
+    test_demangling "arm: g__FcCcT1" \
 	"g\[(\]+char, (const char|char const), char\[)\]+"
 
-    gdb_test_exact "maint demangle __ct__17T5__pt__8_PFcPv_iFi" "T5<int (*)(char, void *)>::T5(int)"
+    test_demangling_exact "arm: __ct__17T5__pt__8_PFcPv_iFi" "T5<int (*)(char, void *)>::T5(int)"
 
-    gdb_test_exact "maint demangle f__FicdPc" "f(int, char, double, char *)"
-    gdb_test_exact "maint demangle __nw__FUi" "operator new(unsigned int)"
-    gdb_test_exact "maint demangle __ct__Q3_2T11a1bSFi" "T1::a::b::b(int) static"
-    gdb_test_exact "maint demangle __dt__Q3_2T11a1bSFi" "T1::a::b::~b(int) static"
-    gdb_test_exact "maint demangle put__Q3_2T11a1bSFi" "T1::a::b::put(int) static"
-    gdb_test_exact "maint demangle get__Q2_2T11aSFv" "T1::a::get(void) static"
-    gdb_test_exact "maint demangle put__2T1SFi" "T1::put(int) static"
-    gdb_test_exact "maint demangle put__Q5_2T11a1b1c1dSFi" "T1::a::b::c::d::put(int) static"
-    gdb_test_exact "maint demangle get__Q4_2T11a1b1cSFv" "T1::a::b::c::get(void) static"
-    gdb_test_exact "maint demangle put__Q2_2T11aSFi" "T1::a::put(int) static"
-    gdb_test_exact "maint demangle put__Q4_2T11a1b1cSFi" "T1::a::b::c::put(int) static"
-    gdb_test_exact "maint demangle get__Q3_2T11a1bSFv" "T1::a::b::get(void) static"
-    gdb_test_exact "maint demangle get__2T1SFv" "T1::get(void) static"
-    gdb_test_exact "maint demangle get__Q5_2T11a1b1c1dSFv" "T1::a::b::c::d::get(void) static"
+    test_demangling_exact "arm: f__FicdPc" "f(int, char, double, char *)"
+    test_demangling_exact "arm: __nw__FUi" "operator new(unsigned int)"
+    test_demangling_exact "arm: __ct__Q3_2T11a1bSFi" "T1::a::b::b(int) static"
+    test_demangling_exact "arm: __dt__Q3_2T11a1bSFi" "T1::a::b::~b(int) static"
+    test_demangling_exact "arm: put__Q3_2T11a1bSFi" "T1::a::b::put(int) static"
+    test_demangling_exact "arm: get__Q2_2T11aSFv" "T1::a::get(void) static"
+    test_demangling_exact "arm: put__2T1SFi" "T1::put(int) static"
+    test_demangling_exact "arm: put__Q5_2T11a1b1c1dSFi" "T1::a::b::c::d::put(int) static"
+    test_demangling_exact "arm: get__Q4_2T11a1b1cSFv" "T1::a::b::c::get(void) static"
+    test_demangling_exact "arm: put__Q2_2T11aSFi" "T1::a::put(int) static"
+    test_demangling_exact "arm: put__Q4_2T11a1b1cSFi" "T1::a::b::c::put(int) static"
+    test_demangling_exact "arm: get__Q3_2T11a1bSFv" "T1::a::b::get(void) static"
+    test_demangling_exact "arm: get__2T1SFv" "T1::get(void) static"
+    test_demangling_exact "arm: get__Q5_2T11a1b1c1dSFv" "T1::a::b::c::d::get(void) static"
 
-    gdb_test_exact "maint demangle __dt__11T1__pt__2_cFv" "T1<char>::~T1(void)"
+    test_demangling_exact "arm: __dt__11T1__pt__2_cFv" "T1<char>::~T1(void)"
 
-    gdb_test_exact "maint demangle __dt__12T1__pt__3_1tFv" "T1<t>::~T1(void)"
+    test_demangling_exact "arm: __dt__12T1__pt__3_1tFv" "T1<t>::~T1(void)"
 
-    gdb_test_exact "maint demangle __dl__12T1__pt__3_1tSFPv" "T1<t>::operator delete(void *) static"
+    test_demangling_exact "arm: __dl__12T1__pt__3_1tSFPv" "T1<t>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle __ct__11T1__pt__2_cFi" "T1<char>::T1(int)"
+    test_demangling_exact "arm: __ct__11T1__pt__2_cFi" "T1<char>::T1(int)"
 
-    gdb_test_exact "maint demangle __ct__11T1__pt__2_cFv" "T1<char>::T1(void)"
+    test_demangling_exact "arm: __ct__11T1__pt__2_cFv" "T1<char>::T1(void)"
 
-    gdb_test_exact "maint demangle __ct__12T1__pt__3_1tFi" "T1<t>::T1(int)"
+    test_demangling_exact "arm: __ct__12T1__pt__3_1tFi" "T1<t>::T1(int)"
 
-    gdb_test_exact "maint demangle __ct__12T1__pt__3_1tFv" "T1<t>::T1(void)"
+    test_demangling_exact "arm: __ct__12T1__pt__3_1tFv" "T1<t>::T1(void)"
 
-    gdb_test_exact "maint demangle __dl__11T1__pt__2_cSFPv" "T1<char>::operator delete(void *) static"
+    test_demangling_exact "arm: __dl__11T1__pt__2_cSFPv" "T1<char>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle bar__3fooFPv"       "foo::bar(void *)"
-    gdb_test "maint dem bar__3fooFPCv" \
+    test_demangling_exact "arm: bar__3fooFPv"       "foo::bar(void *)"
+    test_demangling "arm: bar__3fooFPCv" \
 	     "foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+"
-    gdb_test_exact "maint demangle bar__3fooCFPv"      "foo::bar(void *) const"
-    gdb_test "maint dem bar__3fooCFPCv" \
+    test_demangling_exact "arm: bar__3fooCFPv"      "foo::bar(void *) const"
+    test_demangling "arm: bar__3fooCFPCv" \
 	    "foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+ const"
-    gdb_test_exact "maint demangle __eq__3fooFR3foo"   "foo::operator==(foo &)"
-    gdb_test "maint dem __eq__3fooFRC3foo" \
+    test_demangling_exact "arm: __eq__3fooFR3foo"   "foo::operator==(foo &)"
+    test_demangling "arm: __eq__3fooFRC3foo" \
 	 "foo::operator==\[(\]+(const foo|foo const) &\[)\]+"
-    gdb_test_exact "maint demangle __eq__3fooCFR3foo"  "foo::operator==(foo &) const"
-    gdb_test "maint dem __eq__3fooCFRC3foo" \
+    test_demangling_exact "arm: __eq__3fooCFR3foo"  "foo::operator==(foo &) const"
+    test_demangling "arm: __eq__3fooCFRC3foo" \
 	"foo::operator==\[(\]+(const foo|foo const) &\[)\]+ const"
 
-    gdb_test_exact "maint demangle elem__15vector__pt__2_dFi" "vector<double>::elem(int)"
+    test_demangling_exact "arm: elem__15vector__pt__2_dFi" "vector<double>::elem(int)"
 
-    gdb_test_exact "maint demangle elem__15vector__pt__2_iFi" "vector<int>::elem(int)"
+    test_demangling_exact "arm: elem__15vector__pt__2_iFi" "vector<int>::elem(int)"
 
-    gdb_test_exact "maint demangle __ct__15vector__pt__2_dFi" "vector<double>::vector(int)"
+    test_demangling_exact "arm: __ct__15vector__pt__2_dFi" "vector<double>::vector(int)"
 
-    gdb_test_exact "maint demangle __ct__15vector__pt__2_iFi" "vector<int>::vector(int)"
+    test_demangling_exact "arm: __ct__15vector__pt__2_iFi" "vector<int>::vector(int)"
 
-    gdb_test_exact "maint demangle __ct__25DListNode__pt__9_R6RLabelFR6RLabelP25DListNode__pt__9_R6RLabelT2" \
+    test_demangling_exact "arm: __ct__25DListNode__pt__9_R6RLabelFR6RLabelP25DListNode__pt__9_R6RLabelT2" \
 	"DListNode<RLabel &>::DListNode(RLabel &, DListNode<RLabel &> *, DListNode<RLabel &> *)"
 
-    gdb_test_exact "maint demangle bar__3fooFiT16FooBar" "foo::bar(int, int, FooBar)"
+    test_demangling_exact "arm: bar__3fooFiT16FooBar" "foo::bar(int, int, FooBar)"
 
-    gdb_test_exact "maint demangle bar__3fooFPiN51PdN37PcN211T1iN215" \
+    test_demangling_exact "arm: bar__3fooFPiN51PdN37PcN211T1iN215" \
       "foo::bar(int *, int *, int *, int *, int *, int *, double *, double *, double *, double *, char *, char *, char *, int *, int, int, int)"
 
+    test_demangling_exact "arm: _Utf390_1__1_9223372036854775807__9223372036854775" \
+	    "Can't demangle \"_Utf390_1__1_9223372036854775807__9223372036854775\""
 }
 
 proc test_hp_style_demangling {} {
-    global gdb_prompt
-
-    # Set the demangling style to "hp" and then check to make sure
-    # it really got set.  Return if the style failed to get set for
-    # some reason.
-
-    send_gdb "set demangle-style hp\n"
-    gdb_expect {
-	-re "set demangle-style hp\[\r\n\]+$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" { fail "set demangle-style hp failed" ; return }
-	timeout { fail "set demangle-style hp failed (timeout)" ; return }
-    }
-
-    send_gdb "show demangle-style\n"
-    gdb_expect {
-	-re "The current C\[+\]+ demangling style is \"hp\".\r\n$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" { fail "demangling style not set to hp" }
-	timeout { fail "show demangle-style timed out (HP)" }
-    }
 
     # HP aCC mangling style is based on ARM for all the basic stuff,
     # so first we use some of the ARM tests here.  Later we have HP-specific
     # tests.
         
-    gdb_test "maint dem g__FP1cPC1cT1" \
+    test_demangling "hp: g__FP1cPC1cT1" \
 	"g\[(\]+c *\[*\]+, (const c|c const) *\[*\]+, c *\[*\]+\[)\]+"
-    gdb_test "maint dem g__FPUlPCUlT1" \
+    test_demangling "hp: g__FPUlPCUlT1" \
 	"g\[(\]+unsigned long \[*\]+, (const unsigned long|unsigned long const) \[*\]+, unsigned long \[*\]+\[)\]+"
-    gdb_test "maint dem g__FPUiPCUiT1" \
+    test_demangling "hp: g__FPUiPCUiT1" \
 	"g\[(\]+unsigned int \[*\]+, (const unsigned int|unsigned int const) \[*\]+, unsigned int \[*\]+\[)\]+"
-    gdb_test "maint dem g__FPUsPCUsT1" \
+    test_demangling "hp: g__FPUsPCUsT1" \
 	"g\[(\]+unsigned short \[*\]+, (const unsigned short|unsigned short const) \[*\]+, unsigned short \[*\]+\[)\]+"
-    gdb_test "maint dem g__FPUcPCUcT1" \
+    test_demangling "hp: g__FPUcPCUcT1" \
 	"g\[(\]+unsigned char \[*\]+, (const unsigned char|unsigned char const) \[*\]+, unsigned char \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1TPlPClT2" \
+    test_demangling "hp: g__F1TPlPClT2" \
 	"g\[(\]+T, long \[*\]+, (const long|long const) \[*\]+, long \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1RRlRClT2" \
+    test_demangling "hp: g__F1RRlRClT2" \
 	"g\[(\]+R, long &, (const long|long const) &, long &\[)\]+"
-    gdb_test "maint dem g__F1TPiPCiT2" \
+    test_demangling "hp: g__F1TPiPCiT2" \
 	"g\[(\]+T, int \[*\]+, (const int|int const) \[*\]+, int \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1RRiRCiT2" \
+    test_demangling "hp: g__F1RRiRCiT2" \
 	"g\[(\]+R, int &, (const int|int const) &, int &\[)\]+"
-    gdb_test "maint dem g__F1TPsPCsT2" \
+    test_demangling "hp: g__F1TPsPCsT2" \
 	"g\[(\]+T, short \[*\]+, (const short|short const) \[*\]+, short \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1RRsRCsT2" \
+    test_demangling "hp: g__F1RRsRCsT2" \
 	"g\[(\]+R, short &, (const short|short const) &, short &\[)\]+"
-    gdb_test "maint dem g__F1TPcPCcT2" \
+    test_demangling "hp: g__F1TPcPCcT2" \
 	"g\[(\]+T, char \[*\]+, (const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1RRcRCcT2" \
+    test_demangling "hp: g__F1RRcRCcT2" \
 	"g\[(\]+R, char &, (const char|char const) &, char &\[)\]+"
 
-    gdb_test "maint dem __gt__FRC2T2c" \
+    test_demangling "hp: __gt__FRC2T2c" \
 	"operator>\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test "maint dem __ge__FRC2T2c" \
+    test_demangling "hp: __ge__FRC2T2c" \
 	"operator>=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test "maint dem __lt__FRC2T2c" \
+    test_demangling "hp: __lt__FRC2T2c" \
 	"operator<\[(\]+(const T2|T2 const) &, char\[)\]+"
 
-    gdb_test "maint dem __le__FRC2T2c" \
+    test_demangling "hp: __le__FRC2T2c" \
 	"operator<=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test "maint dem __ne__FRC2T2c" \
+    test_demangling "hp: __ne__FRC2T2c" \
 	"operator!=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test "maint dem __eq__FRC2T2c" \
+    test_demangling "hp: __eq__FRC2T2c" \
 	"operator==\[(\]+(const T2|T2 const) &, char\[)\]+"
-    gdb_test_exact "maint demangle __amd__FR2T2i" "operator%=(T2 &, int)"
-    gdb_test_exact "maint demangle __adv__FR2T2i" "operator/=(T2 &, int)"
-    gdb_test_exact "maint demangle __amu__FR2T2i" "operator*=(T2 &, int)"
-    gdb_test_exact "maint demangle __ami__FR2T2i" "operator-=(T2 &, int)"
-    gdb_test_exact "maint demangle __apl__FR2T2i" "operator+=(T2 &, int)"
-    gdb_test_exact "maint demangle __nw__2T1SFUi" "T1::operator new(unsigned int) static"
-    gdb_test_exact "maint demangle __dl__2T1SFPv" "T1::operator delete(void *) static"
-    gdb_test_exact "maint demangle put__2T7SFi" "T7::put(int) static"
-
-    gdb_test_exact "maint demangle h__FUc" "h(unsigned char)"
-    gdb_test_exact "maint demangle f__Fic" "f(int, char)"
-    gdb_test_exact "maint demangle h__FUi" "h(unsigned int)"
-    gdb_test_exact "maint demangle h__Fci" "h(char, int)"
-    gdb_test_exact "maint demangle h__FUl" "h(unsigned long)"
-    gdb_test_exact "maint demangle h__Fcl" "h(char, long)"
-    gdb_test_exact "maint demangle h__FUs" "h(unsigned short)"
-    gdb_test_exact "maint demangle h__Fcs" "h(char, short)"
-    gdb_test "maint dem __amd__FR2T2RC2T2" \
+    test_demangling_exact "hp: __amd__FR2T2i" "operator%=(T2 &, int)"
+    test_demangling_exact "hp: __adv__FR2T2i" "operator/=(T2 &, int)"
+    test_demangling_exact "hp: __amu__FR2T2i" "operator*=(T2 &, int)"
+    test_demangling_exact "hp: __ami__FR2T2i" "operator-=(T2 &, int)"
+    test_demangling_exact "hp: __apl__FR2T2i" "operator+=(T2 &, int)"
+    test_demangling_exact "hp: __nw__2T1SFUi" "T1::operator new(unsigned int) static"
+    test_demangling_exact "hp: __dl__2T1SFPv" "T1::operator delete(void *) static"
+    test_demangling_exact "hp: put__2T7SFi" "T7::put(int) static"
+
+    test_demangling_exact "hp: h__FUc" "h(unsigned char)"
+    test_demangling_exact "hp: f__Fic" "f(int, char)"
+    test_demangling_exact "hp: h__FUi" "h(unsigned int)"
+    test_demangling_exact "hp: h__Fci" "h(char, int)"
+    test_demangling_exact "hp: h__FUl" "h(unsigned long)"
+    test_demangling_exact "hp: h__Fcl" "h(char, long)"
+    test_demangling_exact "hp: h__FUs" "h(unsigned short)"
+    test_demangling_exact "hp: h__Fcs" "h(char, short)"
+    test_demangling "hp: __amd__FR2T2RC2T2" \
 	"operator%=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __adv__FR2T2RC2T2" \
+    test_demangling "hp: __adv__FR2T2RC2T2" \
 	"operator/=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __amu__FR2T2RC2T2" \
+    test_demangling "hp: __amu__FR2T2RC2T2" \
 	"operator\[*\]+=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __ami__FR2T2RC2T2" \
+    test_demangling "hp: __ami__FR2T2RC2T2" \
 	"operator-=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __apl__FR2T2RC2T2" \
+    test_demangling "hp: __apl__FR2T2RC2T2" \
 	"operator\[+\]+=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
 
-    gdb_test "maint dem g__F1SRPUlRPCUlT2" \
+    test_demangling "hp: g__F1SRPUlRPCUlT2" \
 	"g\[(\]+S, unsigned long \[*\]+&, (const unsigned long|unsigned long const) \[*\]+&, unsigned long \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1SRPUiRPCUiT2" \
+    test_demangling "hp: g__F1SRPUiRPCUiT2" \
 	"g\[(\]+S, unsigned int \[*\]+&, (const unsigned int|unsigned int const) \[*\]+&, unsigned int \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1SRPUsRPCUsT2" \
+    test_demangling "hp: g__F1SRPUsRPCUsT2" \
 	"g\[(\]+S, unsigned short \[*\]+&, (const unsigned short|unsigned short const) \[*\]+&, unsigned short \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1SRPUcRPCUcT2" \
+    test_demangling "hp: g__F1SRPUcRPCUcT2" \
 	"g\[(\]+S, unsigned char \[*\]+&, (const unsigned char|unsigned char const) \[*\]+&, unsigned char \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1T1SRPlRPClT3" \
+    test_demangling "hp: g__F1T1SRPlRPClT3" \
 	"g\[(\]+T, S, long \[*\]+&, (const long|long const) \[*\]+&, long \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1T1SRPiRPCiT3" \
+    test_demangling "hp: g__F1T1SRPiRPCiT3" \
 	"g\[(\]+T, S, int \[*\]+&, (const int|int const) \[*\]+&, int \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1T1SRPcRPCcT3" \
+    test_demangling "hp: g__F1T1SRPcRPCcT3" \
 	"g\[(\]+T, S, char \[*\]+&, (const char|char const) \[*\]+&, char \[*\]+&\[)\]+"
 
 
-    gdb_test "maint dem __gt__FRC2T2T1" \
+    test_demangling "hp: __gt__FRC2T2T1" \
 	"operator>\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __ge__FRC2T2T1" \
+    test_demangling "hp: __ge__FRC2T2T1" \
 	"operator>=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __lt__FRC2T2T1" \
+    test_demangling "hp: __lt__FRC2T2T1" \
 	"operator<\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __le__FRC2T2T1" \
+    test_demangling "hp: __le__FRC2T2T1" \
 	"operator<=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __ne__FRC2T2T1" \
+    test_demangling "hp: __ne__FRC2T2T1" \
 	"operator!=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __eq__FRC2T2T1" \
+    test_demangling "hp: __eq__FRC2T2T1" \
 	"operator==\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem g__FcR1cRC1cT2" \
+    test_demangling "hp: g__FcR1cRC1cT2" \
 	"g\[(\]+char, c &, (const c|c const) &, c &\[)\]+"
-    gdb_test "maint dem g__FcRPdRPCdT2" \
+    test_demangling "hp: g__FcRPdRPCdT2" \
 	"g\[(\]+char, double *\[*\]+&, (const double|double const) *\[*\]+&, double *\[*\]+&\[)\]+"
-    gdb_test "maint dem g__FcRPfRPCfT2" \
+    test_demangling "hp: g__FcRPfRPCfT2" \
 	"g\[(\]+char, float *\[*\]+&, (const float|float const) *\[*\]+&, float *\[*\]+&\[)\]+"
-    gdb_test_exact "maint demangle h__FcT1" "h(char, char)"
-    gdb_test_exact "maint demangle f__Ficd" "f(int, char, double)"
-    gdb_test "maint dem g__F1T1SdRPsRPCsT4" \
+    test_demangling_exact "hp: h__FcT1" "h(char, char)"
+    test_demangling_exact "hp: f__Ficd" "f(int, char, double)"
+    test_demangling "hp: g__F1T1SdRPsRPCsT4" \
 	"g\[(\]+T, S, double, short \[*\]+&, (const short|short const) \[*\]+&, short \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1cC1cT1" \
+    test_demangling "hp: g__F1cC1cT1" \
 	"g\[(\]+c, (const c|c const), c\[)\]+"
-    gdb_test "maint dem g__FPdPCdT1" \
+    test_demangling "hp: g__FPdPCdT1" \
 	"g\[(\]+double *\[*\]+, (const double|double const) *\[*\]+, double *\[*\]+\[)\]+"
-    gdb_test "maint dem g__FPfPCfT1" \
+    test_demangling "hp: g__FPfPCfT1" \
 	"g\[(\]+float *\[*\]+, (const float|float const) *\[*\]+, float *\[*\]+\[)\]+"
 
-    gdb_test "maint dem g__FUlCUlT1" \
+    test_demangling "hp: g__FUlCUlT1" \
 	"g\[(\]+unsigned long, (const unsigned long|unsigned long const), unsigned long\[)\]+"
-    gdb_test "maint dem g__FPlPClT1" \
+    test_demangling "hp: g__FPlPClT1" \
 	"g\[(\]+long \[*\]+, (const long|long const) \[*\]+, long \[*\]+\[)\]+"
-    gdb_test "maint dem g__FUiCUiT1" \
+    test_demangling "hp: g__FUiCUiT1" \
 	"g\[(\]+unsigned int, (const unsigned int|unsigned int const), unsigned int\[)\]+"
-    gdb_test "maint dem g__FPiPCiT1" \
+    test_demangling "hp: g__FPiPCiT1" \
 	"g\[(\]+int \[*\]+, (const int|int const) \[*\]+, int \[*\]+\[)\]+"
-    gdb_test "maint dem g__FUsCUsT1" \
+    test_demangling "hp: g__FUsCUsT1" \
 	"g\[(\]+unsigned short, (const unsigned short|unsigned short const), unsigned short\[)\]+"
-    gdb_test "maint dem g__FPsPCsT1" \
+    test_demangling "hp: g__FPsPCsT1" \
 	"g\[(\]+short \[*\]+, (const short|short const) \[*\]+, short \[*\]+\[)\]+"
-    gdb_test "maint dem g__FUcCUcT1" \
+    test_demangling "hp: g__FUcCUcT1" \
 	"g\[(\]+unsigned char, (const unsigned char|unsigned char const), unsigned char\[)\]+"
-    gdb_test "maint dem g__FPcPCcT1" \
+    test_demangling "hp: g__FPcPCcT1" \
 	"g\[(\]+char \[*\]+, (const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    gdb_test "maint dem g__F1TlClT2" \
+    test_demangling "hp: g__F1TlClT2" \
 	"g\[(\]+T, long, (const long|long const), long\[)\]+"
-    gdb_test "maint dem g__F1TiCiT2" \
+    test_demangling "hp: g__F1TiCiT2" \
 	"g\[(\]+T, int, (const int|int const), int\[)\]+"
-    gdb_test "maint dem g__F1TsCsT2" \
+    test_demangling "hp: g__F1TsCsT2" \
 	"g\[(\]+T, short, (const short|short const), short\[)\]+"
-    gdb_test "maint dem g__F1TcCcT2" \
+    test_demangling "hp: g__F1TcCcT2" \
 	"g\[(\]+T, char, (const char|char const), char\[)\]+"
 
-    gdb_test "maint dem printf__FPCce" \
+    test_demangling "hp: printf__FPCce" \
 	"printf\[(\]+(const char|char const) \[*\]+,...\[)\]+"
 
 
-    gdb_test "maint dem g__F1SRUlRCUlT2" \
+    test_demangling "hp: g__F1SRUlRCUlT2" \
 	"g\[(\]+S, unsigned long &, (const unsigned long|unsigned long const) &, unsigned long &\[)\]+"
-    gdb_test "maint dem g__F1SRPlRPClT2" \
+    test_demangling "hp: g__F1SRPlRPClT2" \
 	"g\[(\]+S, long \[*\]+&, (const long|long const) \[*\]+&, long \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1RRUiRCUiT2" \
+    test_demangling "hp: g__F1RRUiRCUiT2" \
 	"g\[(\]+R, unsigned int &, (const unsigned int|unsigned int const) &, unsigned int &\[)\]+"
-    gdb_test "maint dem g__F1SRPiRPCiT2" \
+    test_demangling "hp: g__F1SRPiRPCiT2" \
 	"g\[(\]+S, int \[*\]+&, (const int|int const) \[*\]+&, int \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1RRUsRCUsT2" \
+    test_demangling "hp: g__F1RRUsRCUsT2" \
 	"g\[(\]+R, unsigned short &, (const unsigned short|unsigned short const) &, unsigned short &\[)\]+"
-    gdb_test "maint dem g__F1SRPsRPCsT2" \
+    test_demangling "hp: g__F1SRPsRPCsT2" \
 	"g\[(\]+S, short \[*\]+&, (const short|short const) \[*\]+&, short \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1RRUcRCUcT2" \
+    test_demangling "hp: g__F1RRUcRCUcT2" \
 	"g\[(\]+R, unsigned char &, (const unsigned char|unsigned char const) &, unsigned char &\[)\]+"
-    gdb_test "maint dem g__F1SRPcRPCcT2" \
+    test_demangling "hp: g__F1SRPcRPCcT2" \
 	"g\[(\]+S, char \[*\]+&, (const char|char const) \[*\]+&, char \[*\]+&\[)\]+"
-    gdb_test "maint dem g__F1T1RRlRClT3" \
+    test_demangling "hp: g__F1T1RRlRClT3" \
 	"g\[(\]+T, R, long &, (const long|long const) &, long &\[)\]+"
-    gdb_test "maint dem g__F1T1RRiRCiT3" \
+    test_demangling "hp: g__F1T1RRiRCiT3" \
 	"g\[(\]+T, R, int &, (const int|int const) &, int &\[)\]+"
-    gdb_test "maint dem g__F1T1RRsRCsT3" \
+    test_demangling "hp: g__F1T1RRsRCsT3" \
 	"g\[(\]+T, R, short &, (const short|short const) &, short &\[)\]+"
-    gdb_test "maint dem g__F1T1RRcRCcT3" \
+    test_demangling "hp: g__F1T1RRcRCcT3" \
 	"g\[(\]+T, R, char &, (const char|char const) &, char &\[)\]+"
 
 
-    gdb_test_exact "maint demangle f__FicdPcPFci_v" "f(int, char, double, char *, void (*)(char, int))"
-    gdb_test_exact "maint demangle f__FicdPcPFic_v" "f(int, char, double, char *, void (*)(int, char))"
-    gdb_test_exact "maint demangle get__2T7SFv" "T7::get(void) static"
+    test_demangling_exact "hp: f__FicdPcPFci_v" "f(int, char, double, char *, void (*)(char, int))"
+    test_demangling_exact "hp: f__FicdPcPFic_v" "f(int, char, double, char *, void (*)(int, char))"
+    test_demangling_exact "hp: get__2T7SFv" "T7::get(void) static"
 
 
-    gdb_test "maint dem g__FcRdRCdT2" \
+    test_demangling "hp: g__FcRdRCdT2" \
 	"g\[(\]+char, double &, (const double|double const) &, double &\[)\]+"
-    gdb_test "maint dem g__FcRfRCfT2" \
+    test_demangling "hp: g__FcRfRCfT2" \
 	"g\[(\]+char, float &, (const float|float const) &, float &\[)\]+"
-    gdb_test "maint dem __md__FC2T2i" \
+    test_demangling "hp: __md__FC2T2i" \
 	"operator%\[(\]+(const T2|T2 const), int\[)\]+"
-    gdb_test "maint dem __dv__FC2T2i" \
+    test_demangling "hp: __dv__FC2T2i" \
 	"operator/\[(\]+(const T2|T2 const), int\[)\]+"
-    gdb_test "maint dem __ml__FC2T2i" \
+    test_demangling "hp: __ml__FC2T2i" \
 	"operator\[*\]+\[(\]+(const T2|T2 const), int\[)\]+"
-    gdb_test "maint dem __mi__FC2T2i" \
+    test_demangling "hp: __mi__FC2T2i" \
 	"operator-\[(\]+(const T2|T2 const), int\[)\]+"
-    gdb_test "maint dem __pl__FC2T2i" \
+    test_demangling "hp: __pl__FC2T2i" \
 	"operator\[+\]+\[(\]+(const T2|T2 const), int\[)\]+"
 
 
-    gdb_test_exact "maint demangle h__Fc" "h(char)"
-    gdb_test_exact "maint demangle h__Fd" "h(double)"
-    gdb_test_exact "maint demangle h__Ff" "h(float)"
-    gdb_test_exact "maint demangle h__Fi" "h(int)"
-    gdb_test_exact "maint demangle f__Fi" "f(int)"
-    gdb_test_exact "maint demangle h__Fl" "h(long)"
+    test_demangling_exact "hp: h__Fc" "h(char)"
+    test_demangling_exact "hp: h__Fd" "h(double)"
+    test_demangling_exact "hp: h__Ff" "h(float)"
+    test_demangling_exact "hp: h__Fi" "h(int)"
+    test_demangling_exact "hp: f__Fi" "f(int)"
+    test_demangling_exact "hp: h__Fl" "h(long)"
 
-    gdb_test_exact "maint demangle h__Fs" "h(short)"
-    gdb_test "maint dem __md__FC2T2RC2T2" \
+    test_demangling_exact "hp: h__Fs" "h(short)"
+    test_demangling "hp: __md__FC2T2RC2T2" \
 	"operator%\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __dv__FC2T2RC2T2" \
+    test_demangling "hp: __dv__FC2T2RC2T2" \
 	"operator/\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __ml__FC2T2RC2T2" \
+    test_demangling "hp: __ml__FC2T2RC2T2" \
 	"operator\[*\]+\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __mi__FC2T2RC2T2" \
+    test_demangling "hp: __mi__FC2T2RC2T2" \
 	"operator-\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem __pl__FC2T2RC2T2" \
+    test_demangling "hp: __pl__FC2T2RC2T2" \
 	"operator\[+\]+\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    gdb_test "maint dem g__FcRP1cRPC1cT2" \
+    test_demangling "hp: g__FcRP1cRPC1cT2" \
 	"g\[(\]+char, c *\[*\]+&, (const c|c const) *\[*\]+&, c *\[*\]+&\[)\]+"
 
 
-    gdb_test "maint dem g__FdCdT1" \
+    test_demangling "hp: g__FdCdT1" \
 	"g\[(\]+double, (const double|double const), double\[)\]+"
-    gdb_test "maint dem g__FfCfT1" \
+    test_demangling "hp: g__FfCfT1" \
 	"g\[(\]+float, (const float|float const), float\[)\]+"
-    gdb_test "maint dem g__FlClT1" \
+    test_demangling "hp: g__FlClT1" \
 	"g\[(\]+long, (const long|long const), long\[)\]+"
-    gdb_test "maint dem g__FiCiT1" \
+    test_demangling "hp: g__FiCiT1" \
 	"g\[(\]+int, (const int|int const), int\[)\]+"
-    gdb_test "maint dem g__FsCsT1" \
+    test_demangling "hp: g__FsCsT1" \
 	"g\[(\]+short, (const short|short const), short\[)\]+"
-    gdb_test "maint dem g__FcCcT1" \
+    test_demangling "hp: g__FcCcT1" \
 	"g\[(\]+char, (const char|char const), char\[)\]+"
 
 
-    gdb_test_exact "maint demangle f__FicdPc" "f(int, char, double, char *)"
-    gdb_test_exact "maint demangle __nw__FUi" "operator new(unsigned int)"
-    gdb_test_exact "maint demangle __ct__Q3_2T11a1bSFi" "T1::a::b::b(int) static"
-    gdb_test_exact "maint demangle __dt__Q3_2T11a1bSFi" "T1::a::b::~b(int) static"
-    gdb_test_exact "maint demangle put__Q3_2T11a1bSFi" "T1::a::b::put(int) static"
-    gdb_test_exact "maint demangle get__Q2_2T11aSFv" "T1::a::get(void) static"
-    gdb_test_exact "maint demangle put__2T1SFi" "T1::put(int) static"
-    gdb_test_exact "maint demangle put__Q5_2T11a1b1c1dSFi" "T1::a::b::c::d::put(int) static"
-    gdb_test_exact "maint demangle get__Q4_2T11a1b1cSFv" "T1::a::b::c::get(void) static"
-    gdb_test_exact "maint demangle put__Q2_2T11aSFi" "T1::a::put(int) static"
-    gdb_test_exact "maint demangle put__Q4_2T11a1b1cSFi" "T1::a::b::c::put(int) static"
-    gdb_test_exact "maint demangle get__Q3_2T11a1bSFv" "T1::a::b::get(void) static"
-    gdb_test_exact "maint demangle get__2T1SFv" "T1::get(void) static"
-    gdb_test_exact "maint demangle get__Q5_2T11a1b1c1dSFv" "T1::a::b::c::d::get(void) static"
-
-
-    gdb_test_exact "maint demangle bar__3fooFPv"       "foo::bar(void *)"
-    gdb_test "maint dem bar__3fooFPCv" \
+    test_demangling_exact "hp: f__FicdPc" "f(int, char, double, char *)"
+    test_demangling_exact "hp: __nw__FUi" "operator new(unsigned int)"
+    test_demangling_exact "hp: __ct__Q3_2T11a1bSFi" "T1::a::b::b(int) static"
+    test_demangling_exact "hp: __dt__Q3_2T11a1bSFi" "T1::a::b::~b(int) static"
+    test_demangling_exact "hp: put__Q3_2T11a1bSFi" "T1::a::b::put(int) static"
+    test_demangling_exact "hp: get__Q2_2T11aSFv" "T1::a::get(void) static"
+    test_demangling_exact "hp: put__2T1SFi" "T1::put(int) static"
+    test_demangling_exact "hp: put__Q5_2T11a1b1c1dSFi" "T1::a::b::c::d::put(int) static"
+    test_demangling_exact "hp: get__Q4_2T11a1b1cSFv" "T1::a::b::c::get(void) static"
+    test_demangling_exact "hp: put__Q2_2T11aSFi" "T1::a::put(int) static"
+    test_demangling_exact "hp: put__Q4_2T11a1b1cSFi" "T1::a::b::c::put(int) static"
+    test_demangling_exact "hp: get__Q3_2T11a1bSFv" "T1::a::b::get(void) static"
+    test_demangling_exact "hp: get__2T1SFv" "T1::get(void) static"
+    test_demangling_exact "hp: get__Q5_2T11a1b1c1dSFv" "T1::a::b::c::d::get(void) static"
+
+
+    test_demangling_exact "hp: bar__3fooFPv"       "foo::bar(void *)"
+    test_demangling "hp: bar__3fooFPCv" \
 	     "foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+"
-    gdb_test_exact "maint demangle bar__3fooCFPv"      "foo::bar(void *) const"
-    gdb_test "maint dem bar__3fooCFPCv" \
+    test_demangling_exact "hp: bar__3fooCFPv"      "foo::bar(void *) const"
+    test_demangling "hp: bar__3fooCFPCv" \
 	    "foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+ const"
-    gdb_test_exact "maint demangle __eq__3fooFR3foo"   "foo::operator==(foo &)"
-    gdb_test "maint dem __eq__3fooFRC3foo" \
+    test_demangling_exact "hp: __eq__3fooFR3foo"   "foo::operator==(foo &)"
+    test_demangling "hp: __eq__3fooFRC3foo" \
 	 "foo::operator==\[(\]+(const foo|foo const) &\[)\]+"
-    gdb_test_exact "maint demangle __eq__3fooCFR3foo"  "foo::operator==(foo &) const"
-    gdb_test "maint dem __eq__3fooCFRC3foo" \
+    test_demangling_exact "hp: __eq__3fooCFR3foo"  "foo::operator==(foo &) const"
+    test_demangling "hp: __eq__3fooCFRC3foo" \
 	"foo::operator==\[(\]+(const foo|foo const) &\[)\]+ const"
 
-    gdb_test_exact "maint demangle bar__3fooFiT16FooBar" "foo::bar(int, int, FooBar)"
+    test_demangling_exact "hp: bar__3fooFiT16FooBar" "foo::bar(int, int, FooBar)"
 
-    gdb_test_exact "maint demangle bar__3fooFPiN51PdN37PcN211T1iN215" \
+    test_demangling_exact "hp: bar__3fooFPiN51PdN37PcN211T1iN215" \
       "foo::bar(int *, int *, int *, int *, int *, int *, double *, double *, double *, double *, char *, char *, char *, int *, int, int, int)"
 
 
     # HP aCC specific tests. HP aCC demangling does not use __pt__ for
     # template specifications.  There are other differences as well.
 
-    gdb_test_exact "maint demangle __dt__2T5XTPFiPPdPv_i__Fv" "T5<int (*)(int, double **, void *)>::~T5(void)"
+    test_demangling_exact "hp: __dt__2T5XTPFiPPdPv_i__Fv" "T5<int (*)(int, double **, void *)>::~T5(void)"
 
-    gdb_test_exact "maint demangle __ct__1cFi" "c::c(int)"
+    test_demangling_exact "hp: __ct__1cFi" "c::c(int)"
 
-    gdb_test_exact "maint demangle __dt__2T5XTi__Fv" "T5<int>::~T5(void)"
+    test_demangling_exact "hp: __dt__2T5XTi__Fv" "T5<int>::~T5(void)"
 
-    gdb_test_exact "maint demangle __dt__2T5XTc__Fv" "T5<char>::~T5(void)"
+    test_demangling_exact "hp: __dt__2T5XTc__Fv" "T5<char>::~T5(void)"
 
-    gdb_test_exact "maint demangle __ct__2T2Fi" "T2::T2(int)"
-    gdb_test_exact "maint demangle __dt__2T1Fv" "T1::~T1(void)"
+    test_demangling_exact "hp: __ct__2T2Fi" "T2::T2(int)"
+    test_demangling_exact "hp: __dt__2T1Fv" "T1::~T1(void)"
 
-    gdb_test_exact "maint demangle __dt__2T5XT1x__Fv" "T5<x>::~T5(void)"
+    test_demangling_exact "hp: __dt__2T5XT1x__Fv" "T5<x>::~T5(void)"
 
-    gdb_test_exact "maint demangle __dt__2T5XTPFcPv_i__Fv" "T5<int (*)(char, void *)>::~T5(void)"
+    test_demangling_exact "hp: __dt__2T5XTPFcPv_i__Fv" "T5<int (*)(char, void *)>::~T5(void)"
     
-    gdb_test_exact "maint demangle __ct__2T5XTPFiPPdPv_i__Fi" "T5<int (*)(int, double **, void *)>::T5(int)"
+    test_demangling_exact "hp: __ct__2T5XTPFiPPdPv_i__Fi" "T5<int (*)(int, double **, void *)>::T5(int)"
 
-    gdb_test_exact "maint demangle __dl__2T5XT1x__SFPv" "T5<x>::operator delete(void *) static"
+    test_demangling_exact "hp: __dl__2T5XT1x__SFPv" "T5<x>::operator delete(void *) static"
     
-    gdb_test_exact "maint demangle X__2T5XT1x" "T5<x>::X"
+    test_demangling_exact "hp: X__2T5XT1x" "T5<x>::X"
 
-    gdb_test_exact "maint demangle __ct__2T5XTi__Fi" "T5<int>::T5(int)"
+    test_demangling_exact "hp: __ct__2T5XTi__Fi" "T5<int>::T5(int)"
 
-    gdb_test_exact "maint demangle __ct__2T5XTc__Fi" "T5<char>::T5(int)"
+    test_demangling_exact "hp: __ct__2T5XTc__Fi" "T5<char>::T5(int)"
 
-    gdb_test_exact "maint demangle __dl__2T5XTPFcPv_i__SFPv" "T5<int (*)(char, void *)>::operator delete(void *) static"
+    test_demangling_exact "hp: __dl__2T5XTPFcPv_i__SFPv" "T5<int (*)(char, void *)>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle X__2T5XTPFcPv_i" "T5<int (*)(char, void *)>::X"
+    test_demangling_exact "hp: X__2T5XTPFcPv_i" "T5<int (*)(char, void *)>::X"
 
-    gdb_test_exact "maint demangle __ct__2T5XT1x__Fi" "T5<x>::T5(int)"
+    test_demangling_exact "hp: __ct__2T5XT1x__Fi" "T5<x>::T5(int)"
 
-    gdb_test_exact "maint demangle __dl__2T5XTPFiPPdPv_i__SFPv" "T5<int (*)(int, double **, void *)>::operator delete(void *) static"
-    gdb_test_exact "maint demangle X__2T5XTPFiPPdPv_i" "T5<int (*)(int, double **, void *)>::X"
+    test_demangling_exact "hp: __dl__2T5XTPFiPPdPv_i__SFPv" "T5<int (*)(int, double **, void *)>::operator delete(void *) static"
+    test_demangling_exact "hp: X__2T5XTPFiPPdPv_i" "T5<int (*)(int, double **, void *)>::X"
 
-    gdb_test_exact "maint demangle __dl__2T5XTi__SFPv" "T5<int>::operator delete(void *) static"
+    test_demangling_exact "hp: __dl__2T5XTi__SFPv" "T5<int>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle __dl__2T5XTc__SFPv" "T5<char>::operator delete(void *) static"
+    test_demangling_exact "hp: __dl__2T5XTc__SFPv" "T5<char>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle X__2T5XTc" "T5<char>::X"
+    test_demangling_exact "hp: X__2T5XTc" "T5<char>::X"
 
-    gdb_test_exact "maint demangle X__2T5XTi" "T5<int>::X"
+    test_demangling_exact "hp: X__2T5XTi" "T5<int>::X"
 
-    gdb_test_exact "maint demangle __ct__2T5XTPFcPv_i__Fi" "T5<int (*)(char, void *)>::T5(int)"
+    test_demangling_exact "hp: __ct__2T5XTPFcPv_i__Fi" "T5<int (*)(char, void *)>::T5(int)"
     
-    gdb_test_exact "maint demangle __dt__2T1XTc__Fv" "T1<char>::~T1(void)"
+    test_demangling_exact "hp: __dt__2T1XTc__Fv" "T1<char>::~T1(void)"
 
-    gdb_test_exact "maint demangle __dt__2T1XT1t__Fv" "T1<t>::~T1(void)"
+    test_demangling_exact "hp: __dt__2T1XT1t__Fv" "T1<t>::~T1(void)"
 
-    gdb_test_exact "maint demangle __dl__2T1XT1t__SFPv" "T1<t>::operator delete(void *) static"
+    test_demangling_exact "hp: __dl__2T1XT1t__SFPv" "T1<t>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle __ct__2T1XTc__Fi" "T1<char>::T1(int)"
+    test_demangling_exact "hp: __ct__2T1XTc__Fi" "T1<char>::T1(int)"
 
-    gdb_test_exact "maint demangle __ct__2T1XTc__Fv" "T1<char>::T1(void)"
+    test_demangling_exact "hp: __ct__2T1XTc__Fv" "T1<char>::T1(void)"
 
-    gdb_test_exact "maint demangle __ct__2T1XT1t__Fi" "T1<t>::T1(int)"
+    test_demangling_exact "hp: __ct__2T1XT1t__Fi" "T1<t>::T1(int)"
 
-    gdb_test_exact "maint demangle __ct__2T1XT1t__Fv" "T1<t>::T1(void)"
+    test_demangling_exact "hp: __ct__2T1XT1t__Fv" "T1<t>::T1(void)"
 
-    gdb_test_exact "maint demangle __dl__2T1XTc__SFPv" "T1<char>::operator delete(void *) static"
+    test_demangling_exact "hp: __dl__2T1XTc__SFPv" "T1<char>::operator delete(void *) static"
 
-    gdb_test_exact "maint demangle elem__6vectorXTd__Fi" "vector<double>::elem(int)"
+    test_demangling_exact "hp: elem__6vectorXTd__Fi" "vector<double>::elem(int)"
 
-    gdb_test_exact "maint demangle elem__6vectorXTi__Fi" "vector<int>::elem(int)"
+    test_demangling_exact "hp: elem__6vectorXTi__Fi" "vector<int>::elem(int)"
 
-    gdb_test_exact "maint demangle __ct__6vectorXTd__Fi" "vector<double>::vector(int)"
+    test_demangling_exact "hp: __ct__6vectorXTd__Fi" "vector<double>::vector(int)"
 
-    gdb_test_exact "maint demangle __ct__6vectorXTi__Fi" "vector<int>::vector(int)"
+    test_demangling_exact "hp: __ct__6vectorXTi__Fi" "vector<int>::vector(int)"
 
-    gdb_test_exact "maint demangle __ct__9DListNodeXTR6RLabel__FR6RLabelP9DListNodeXTR6RLabel_T2" \
+    test_demangling_exact "hp: __ct__9DListNodeXTR6RLabel__FR6RLabelP9DListNodeXTR6RLabel_T2" \
 	"DListNode<RLabel &>::DListNode(RLabel &, DListNode<RLabel &> *, DListNode<RLabel &> *)"
 
 
     # Absolute integer constants in template args
 
-    gdb_test_exact "maint demangle elem__6vectorXTiUP34__Fi" "vector<int,34U>::elem(int)"
-    gdb_test_exact "maint demangle elem__6vectorXUP2701Td__Fi" "vector<2701U,double>::elem(int)"
-    gdb_test_exact "maint demangle elem__6vectorXTiSP334__Fi" "vector<int,334>::elem(int)"
-    gdb_test_exact "maint demangle elem__6vectorXTiSN67__Fi" "vector<int,-67>::elem(int)"
-    gdb_test_exact "maint demangle elem__6vectorXTiSM__SCFPPd" "vector<int,-2147483648>::elem(double **) static const"
-    gdb_test_exact "maint demangle elem__6vectorXTiSN67UP4000TRs__Fi" "vector<int,-67,4000U,short &>::elem(int)"
-    gdb_test_exact "maint demangle elem__6vectorXTiSN67TRdTFPv_i__Fi" "vector<int,-67,double &,int (void *)>::elem(int)"
-    gdb_test_exact "maint demangle X__6vectorXTiSN67TdTPvUP5TRs" "vector<int,-67,double,void *,5U,short &>::X"
+    test_demangling_exact "hp: elem__6vectorXTiUP34__Fi" "vector<int,34U>::elem(int)"
+    test_demangling_exact "hp: elem__6vectorXUP2701Td__Fi" "vector<2701U,double>::elem(int)"
+    test_demangling_exact "hp: elem__6vectorXTiSP334__Fi" "vector<int,334>::elem(int)"
+    test_demangling_exact "hp: elem__6vectorXTiSN67__Fi" "vector<int,-67>::elem(int)"
+    test_demangling_exact "hp: elem__6vectorXTiSM__SCFPPd" "vector<int,-2147483648>::elem(double **) static const"
+    test_demangling_exact "hp: elem__6vectorXTiSN67UP4000TRs__Fi" "vector<int,-67,4000U,short &>::elem(int)"
+    test_demangling_exact "hp: elem__6vectorXTiSN67TRdTFPv_i__Fi" "vector<int,-67,double &,int (void *)>::elem(int)"
+    test_demangling_exact "hp: X__6vectorXTiSN67TdTPvUP5TRs" "vector<int,-67,double,void *,5U,short &>::X"
 
     # Named constants in template args
 
-    gdb_test_exact "maint demangle elem__6vectorXTiA3foo__Fi" "vector<int,&foo>::elem(int)"
-    gdb_test_exact "maint demangle elem__6vectorXTiA3fooTPvA5Label__FiPPvT2" "vector<int,&foo,void *,&Label>::elem(int, void **, void **)"
-    gdb_test_exact "maint demangle elem__6vectorXTiSN42A3foo__Fi" "vector<int,-42,&foo>::elem(int)"
+    test_demangling_exact "hp: elem__6vectorXTiA3foo__Fi" "vector<int,&foo>::elem(int)"
+    test_demangling_exact "hp: elem__6vectorXTiA3fooTPvA5Label__FiPPvT2" "vector<int,&foo,void *,&Label>::elem(int, void **, void **)"
+    test_demangling_exact "hp: elem__6vectorXTiSN42A3foo__Fi" "vector<int,-42,&foo>::elem(int)"
 
     # Alternate entry points for functions
 
-    gdb_test_exact "maint demangle __ct__2T5XTPFcPv_i__Fi_2" "T5<int (*)(char, void *)>::T5(int)"
-    gdb_test_exact "maint demangle __ct__2T5XTPFcPv_i__Fi_19" "T5<int (*)(char, void *)>::T5(int)"
-    gdb_test_exact "maint demangle f__FicdPcPFci_v_34" "f(int, char, double, char *, void (*)(char, int))"
+    test_demangling_exact "hp: __ct__2T5XTPFcPv_i__Fi_2" "T5<int (*)(char, void *)>::T5(int)"
+    test_demangling_exact "hp: __ct__2T5XTPFcPv_i__Fi_19" "T5<int (*)(char, void *)>::T5(int)"
+    test_demangling_exact "hp: f__FicdPcPFci_v_34" "f(int, char, double, char *, void (*)(char, int))"
 
 
     # Template partial specializations
 
 # FIXME!  The # characters don't go through expect, and backslashes don't seem to work.
-#    gdb_test_exact "maint demangle spec__13Spec<#1,#1.*>XTiTPi_FPi" "Spec<int,int *>::spec(int *)"
-#    gdb_test_exact "maint demangle spec__16Spec<#1,#1.&,#1>XTiTRiTi_FPi" "Spec<int,int &, int>::spec(int *)"
+#    test_demangling_exact "hp: spec__13Spec<#1,#1.*>XTiTPi_FPi" "Spec<int,int *>::spec(int *)"
+#    test_demangling_exact "hp: spec__16Spec<#1,#1.&,#1>XTiTRiTi_FPi" "Spec<int,int &, int>::spec(int *)"
 # Fake test -- replace # with %
-    gdb_test_exact "maint demangle spec__13Spec<%1,%1.*>XTiTPi_FPi" "Spec<int,int *>::spec(int *)"
-    gdb_test_exact "maint demangle spec__16Spec<%1,%1.&,%1>XTiTRiTi_FPi" "Spec<int,int &,int>::spec(int *)"
+    test_demangling_exact "hp: spec__13Spec<%1,%1.*>XTiTPi_FPi" "Spec<int,int *>::spec(int *)"
+    test_demangling_exact "hp: spec__16Spec<%1,%1.&,%1>XTiTRiTi_FPi" "Spec<int,int &,int>::spec(int *)"
 
     # Global template functions
 
-    gdb_test_exact "maint demangle add__XTc_FcT1" "add<char>(char, char)"
-    gdb_test_exact "maint demangle add__XTcSP9A5label_FcPPlT1" "add<char,9,&label>(char, long **, char)"
-    gdb_test_exact "maint demangle add__XTPfTFPd_f_FcT1" "add<float *,float (double *)>(char, char)"
+    test_demangling_exact "hp: add__XTc_FcT1" "add<char>(char, char)"
+    test_demangling_exact "hp: add__XTcSP9A5label_FcPPlT1" "add<char,9,&label>(char, long **, char)"
+    test_demangling_exact "hp: add__XTPfTFPd_f_FcT1" "add<float *,float (double *)>(char, char)"
 
     # Template for template arg
 
-    gdb_test_exact "maint demangle unLink__12basic_stringXTcT18string_char_traitsXTc_T9allocator_Fv" "basic_string<char,string_char_traits<char>,allocator>::unLink(void)"
+    test_demangling_exact "hp: unLink__12basic_stringXTcT18string_char_traitsXTc_T9allocator_Fv" "basic_string<char,string_char_traits<char>,allocator>::unLink(void)"
+
+    test_demangling_exact "hp: _Utf390_1__1_9223372036854775807__9223372036854775" \
+	    "Can't demangle \"_Utf390_1__1_9223372036854775807__9223372036854775\""
+}
+
 
+proc catch_demangling_errors {command} {
+    if {[catch $command result]} {
+	puts "ERROR: demangle.exp: while running $command: $result"
+    }
 }
+
 # Test support for different demangling styles.  Note that this does
 # not depend upon running the test program and does not depend upon
 # gdb being able to lookup any C++ symbols.  It simply calls the 
@@ -1507,11 +1547,14 @@ proc do_tests {} {
     gdb_expect -re "$gdb_prompt $"
     send_gdb "set width 0\n"
     gdb_expect -re "$gdb_prompt $"
-    
-    test_lucid_style_demangling
-    test_gnu_style_demangling
-    test_arm_style_demangling
-    test_hp_style_demangling
+
+    # Using catch_demangling_errors this way ensures that, if one of
+    # the functions raises a Tcl error, then it'll get reported, and
+    # the rest of the functions will still run.
+    catch_demangling_errors test_lucid_style_demangling
+    catch_demangling_errors test_gnu_style_demangling
+    catch_demangling_errors test_arm_style_demangling
+    catch_demangling_errors test_hp_style_demangling
 }
 
 do_tests
diff --git a/gdb/testsuite/gdb.c++/derivation.exp b/gdb/testsuite/gdb.c++/derivation.exp
index ed3cc2c..80baf75 100644
--- a/gdb/testsuite/gdb.c++/derivation.exp
+++ b/gdb/testsuite/gdb.c++/derivation.exp
@@ -104,7 +104,8 @@ gdb_expect {
 
 send_gdb "ptype a_instance\n"
 gdb_expect {
-    -re "type = class A \{\r\n\[\t \]*public:\r\n\[\t \]*int a;\r\n\[\t \]*int aa;\[\r\n\t \]+A\\(void\\);\r\n\[\t \]*int afoo\\(void\\);\r\n\[\t \]*int foo\\(void\\);\r\n\}.*$gdb_prompt $"  { pass "ptype a_instance" }
+    -re "type = class A \{\r\n\[\t \]*public:\r\n\[\t \]*int a;\r\n\[\t \]*int aa;\[\r\n\t ]+A & operator=\\(A const &\\);\[\r\n\t ]+A\\(A const &\\);\[\r\n\t ]+A\\(void\\);\r\n\[\t \]*int afoo\\(void\\);\r\n\[\t \]*int foo\\(void\\);\r\n\}.*$gdb_prompt $"  { pass "ptype a_instance (with synth ops)" }
+    -re "type = class A \{\r\n\[\t \]*public:\r\n\[\t \]*int a;\r\n\[\t \]*int aa;\[\r\n\t \]+A\\(void\\);\r\n\[\t \]*int afoo\\(void\\);\r\n\[\t \]*int foo\\(void\\);\r\n\}.*$gdb_prompt $"  { pass "ptype a_instance (no synth ops)" }
     -re ".*$gdb_prompt $"   {  fail "ptype a_instance" }
     timeout             { fail "(timeout) ptype a_instance" }
 }
@@ -125,7 +126,7 @@ gdb_expect {
   if {$gcc_compiled} then {
       send_gdb "ptype d_instance\n"
       gdb_expect {
-	  -re "type = class D : private A, public B, private C \{\r\n\[\t \]*public:\r\n\[\t \]*int d;\r\n\[\t \]*int dd;\[\r\n\t \]+D\\(void\\);\r\n\[\t \]*int dfoo\\(void\\);\r\n\[\t \]*int foo\\(void\\);\r\n\}.*$gdb_prompt $"  { pass "ptype d_instance" }
+	  -re "type = class D : private A, public B, private C \{\r\n\[\t \]*public:\r\n\[\t \]*int d;\r\n\[\t \]*int dd;\[\r\n\t ]+D & operator=\\(D const &\\);\[\r\n\t ]+D\\(D const &\\);\[\r\n\t \]+D\\(void\\);\r\n\[\t \]*int dfoo\\(void\\);\r\n\[\t \]*int foo\\(void\\);\r\n\}.*$gdb_prompt $"  { pass "ptype d_instance" }
 	  -re ".*$gdb_prompt $"   {  fail "ptype d_instance" }
 	  timeout             { fail "(timeout) ptype d_instance" }
       }
@@ -154,7 +155,7 @@ gdb_expect {
   if {$gcc_compiled} {
       send_gdb "ptype e_instance\n"
       gdb_expect {
-	  -re "type = class E : public A, private B, private C \{\r\n\[\t \]*public:\r\n\[\t \]*int e;\r\n\[\t \]*int ee;\[\r\n\t \]+E\\(void\\);\r\n\[\t \]*int efoo\\(void\\);\r\n\[\t \]*int foo\\(void\\);\r\n\}.*$gdb_prompt $"  { pass "ptype e_instance" }
+	  -re "type = class E : public A, private B, private C \{\r\n\[\t \]*public:\r\n\[\t \]*int e;\r\n\[\t \]*int ee;\[\r\n\t ]+E & operator=\\(E const &\\);\[\r\n\t ]+E\\(E const &\\);\[\r\n\t \]+E\\(void\\);\r\n\[\t \]*int efoo\\(void\\);\r\n\[\t \]*int foo\\(void\\);\r\n\}.*$gdb_prompt $"  { pass "ptype e_instance" }
 	  -re ".*$gdb_prompt $"   {  fail "ptype e_instance" }
 	  timeout             { fail "(timeout) ptype e_instance" }
       }
@@ -182,6 +183,7 @@ gdb_expect {
 
 send_gdb "ptype f_instance\n"
 gdb_expect {
+    -re "type = class F : private A, public B, private C \{\r\n\[\t \]*public:\r\n\[\t \]*int f;\r\n\[\t \]*int ff;\[\r\n\t ]+F & operator=\\(F const &\\);\[\r\n\t ]+F\\(F const &\\);\[\r\n\t \]+F\\(void\\);\r\n\[\t \]*int ffoo\\(void\\);\r\n\[\t \]*int foo\\(void\\);\r\n\}.*$gdb_prompt $"  { pass "ptype f_instance" }
     -re "type = class F : private A, public B, private C \{\r\n\[\t \]*public:\r\n\[\t \]*int f;\r\n\[\t \]*int ff;\[\r\n\t \]+F\\(void\\);\r\n\[\t \]*int ffoo\\(void\\);\r\n\[\t \]*int foo\\(void\\);\r\n\}.*$gdb_prompt $"  { pass "ptype f_instance" }
     -re ".*$gdb_prompt $"   {  fail "ptype f_instance" }
     timeout             { fail "(timeout) ptype f_instance" }
diff --git a/gdb/testsuite/gdb.c++/method.exp b/gdb/testsuite/gdb.c++/method.exp
index a3939dc..edfa689 100644
--- a/gdb/testsuite/gdb.c++/method.exp
+++ b/gdb/testsuite/gdb.c++/method.exp
@@ -197,7 +197,7 @@ gdb_expect {
 
 send_gdb "print res\n"
 gdb_expect {
-   -re "\\$\[0-9\]* = \[0-9\]*\r\n$gdb_prompt $" {
+   -re "\\$\[0-9\]* = .\[0-9\]*\r\n$gdb_prompt $" {
        pass "print res in getFunky"
    }
    -re ".*$gdb_prompt $" { fail "print res in getfunky" }
diff --git a/gdb/testsuite/gdb.c++/misc.cc b/gdb/testsuite/gdb.c++/misc.cc
index ffeb739..4cf9318 100644
--- a/gdb/testsuite/gdb.c++/misc.cc
+++ b/gdb/testsuite/gdb.c++/misc.cc
@@ -498,6 +498,8 @@ main()
 
   /* Class with enumeration inside it */ 
   ClassWithEnum obj_with_enum;
+  obj_with_enum.priv_enum = ClassWithEnum::red;
+  obj_with_enum.x = 0;
   obj_with_enum.priv_enum = ClassWithEnum::green;
 
   return foo.*pmi;
diff --git a/gdb/testsuite/gdb.c++/overload.cc b/gdb/testsuite/gdb.c++/overload.cc
index 40feb3b..58d07de 100644
--- a/gdb/testsuite/gdb.c++/overload.cc
+++ b/gdb/testsuite/gdb.c++/overload.cc
@@ -58,7 +58,7 @@ int main ()
     float arg11 =100.0;
     double arg12 = 200.0;
 
-    char *str = "A";
+    char *str = (char *) "A";
     foo foo_instance1(111);
     foo foo_instance2(222, str);
     foo foo_instance3(foo_instance2);
diff --git a/gdb/testsuite/gdb.c++/ovldbreak.exp b/gdb/testsuite/gdb.c++/ovldbreak.exp
index c90b51d..219182b 100644
--- a/gdb/testsuite/gdb.c++/ovldbreak.exp
+++ b/gdb/testsuite/gdb.c++/ovldbreak.exp
@@ -670,11 +670,4 @@ gdb_test "info break" \
         timeout { fail "(timeout) continue to bp overloaded : double"  }
     }
 
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Continuing.\r\n\r\nProgram exited normally.\r\n$gdb_prompt $" {
-            pass "finish program"
-        }
-        -re "$gdb_prompt $" { fail "finish program"  }
-        timeout { fail "(timeout) finish program"  }
-    }
+    gdb_continue_to_end "finish program"
diff --git a/gdb/testsuite/gdb.c++/ref-types.exp b/gdb/testsuite/gdb.c++/ref-types.exp
index 7f25590..2a9d337 100644
--- a/gdb/testsuite/gdb.c++/ref-types.exp
+++ b/gdb/testsuite/gdb.c++/ref-types.exp
@@ -1,4 +1,5 @@
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# Tests for reference types with short type variables in GDB.
+# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,12 +20,6 @@
 
 # written by Elena Zannoni (ezannoni@cygnus.com)
 
-# This file is part of the gdb testsuite
-#
-# tests for reference types
-# with short type variables.
-# 
-
 if $tracelevel then {
         strace $tracelevel
         }
@@ -162,6 +157,7 @@ gdb_expect {
 send_gdb "ptype as\n"
 gdb_expect {
     -re "type = short \\\[4\\\].*$gdb_prompt $"  { pass "ptype as" }
+    -re "type = short int \\\[4\\\].*$gdb_prompt $"  { pass "ptype as" }
     -re ".*$gdb_prompt $"   {  fail "ptype as" }
     timeout             { fail "(timeout) ptype as" }
 }
@@ -197,7 +193,10 @@ send_gdb "print rs\n"
 gdb_expect {
     -re ".\[0-9\]* = \\(short &\\) @$hex: -1.*$gdb_prompt $" {
         pass "print value of rs"
-      }
+    }
+    -re ".\[0-9\]* = \\(short int &\\) @$hex: -1.*$gdb_prompt $" {
+        pass "print value of rs"
+    }
     -re ".*$gdb_prompt $" { fail "print value of rs" }
     timeout           { fail "(timeout) print value of rs" }
     eof { fail "print rs ($GDB dumped core) (FIXME)" ; gdb_start_again ; }
@@ -207,6 +206,7 @@ gdb_expect {
 send_gdb "ptype rs\n"
 gdb_expect {
     -re "type = short &.*$gdb_prompt $"  { pass "ptype rs" }
+    -re "type = short int &.*$gdb_prompt $"  { pass "ptype rs" }
     -re ".*$gdb_prompt $"   {  fail "ptype rs" }
     timeout             { fail "(timeout) ptype rs" }
 }
@@ -225,6 +225,7 @@ gdb_expect {
 send_gdb "ptype rps\n"
 gdb_expect {
     -re "type = short \\*&.*$gdb_prompt $"  { pass "ptype rps" }
+    -re "type = short int \\*&.*$gdb_prompt $"  { pass "ptype rps" }
     -re ".*$gdb_prompt $"   {  fail "ptype rps" }
     timeout             { fail "(timeout) ptype rps" }
 }
@@ -244,6 +245,7 @@ gdb_expect {
 send_gdb "ptype ras\n"
 gdb_expect {
     -re "type = short \\\(&\\\)\\\[4\\\].*$gdb_prompt $"  { pass "ptype ras" }
+    -re "type = short int \\\(&\\\)\\\[4\\\].*$gdb_prompt $"  { pass "ptype ras" }
     -re ".*$gdb_prompt $"   {  fail "ptype ras" }
     timeout             { fail "(timeout) ptype ras" }
 }
diff --git a/gdb/testsuite/gdb.c++/ref-types2.exp b/gdb/testsuite/gdb.c++/ref-types2.exp
index 6754147..5557721 100644
--- a/gdb/testsuite/gdb.c++/ref-types2.exp
+++ b/gdb/testsuite/gdb.c++/ref-types2.exp
@@ -1,4 +1,5 @@
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# Tests for reference types with elementary type variables in GDB.
+# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,12 +20,6 @@
 
 # written by Elena Zannoni (ezannoni@cygnus.com)
 
-# This file is part of the gdb testsuite
-#
-# tests for reference types
-# with elementary type variables.
-# 
-
 if $tracelevel then {
         strace $tracelevel
         }
@@ -140,6 +135,7 @@ gdb_expect {
 send_gdb "ptype US\n"
 gdb_expect {
     -re "type = unsigned short.*$gdb_prompt $"  { pass "ptype US" }
+    -re "type = short unsigned.*$gdb_prompt $"  { pass "ptype US" }
     -re ".*$gdb_prompt $"   {  fail "ptype US" }
     timeout             { fail "(timeout) ptype US" }
 }
@@ -212,6 +208,7 @@ gdb_expect {
 send_gdb "ptype UL\n"
 gdb_expect {
     -re "type = unsigned long.*$gdb_prompt $"  { pass "ptype UL" }
+    -re "type = long unsigned.*$gdb_prompt $"  { pass "ptype UL" }
     -re ".*$gdb_prompt $"   {  fail "ptype UL" }
     timeout             { fail "(timeout) ptype UL" }
 }
@@ -284,6 +281,7 @@ gdb_expect {
 send_gdb "ptype rS\n"
 gdb_expect {
     -re "type = short &.*$gdb_prompt $"  { pass "ptype rS" }
+    -re "type = short int &.*$gdb_prompt $"  { pass "ptype rS" }
     -re ".*$gdb_prompt $"   {  fail "ptype rS" }
     timeout             { fail "(timeout) ptype rS" }
 }
@@ -293,6 +291,7 @@ gdb_expect {
 send_gdb "ptype rUS\n"
 gdb_expect {
     -re "type = unsigned short &.*$gdb_prompt $"  { pass "ptype rUS" }
+    -re "type = short unsigned int &.*$gdb_prompt $"  { pass "ptype rUS" }
     -re ".*$gdb_prompt $"   {  fail "ptype rUS" }
     timeout             { fail "(timeout) ptype rUS" }
 }
@@ -319,6 +318,7 @@ gdb_expect {
 send_gdb "ptype rL\n"
 gdb_expect {
     -re "type = long &.*$gdb_prompt $"  { pass "ptype rL" }
+    -re "type = long int &.*$gdb_prompt $"  { pass "ptype rL" }
     -re ".*$gdb_prompt $"   {  fail "ptype rL" }
     timeout             { fail "(timeout) ptype rL" }
 }
@@ -327,6 +327,7 @@ gdb_expect {
 send_gdb "ptype rUL\n"
 gdb_expect {
     -re "type = unsigned long &.*$gdb_prompt $"  { pass "ptype rUL" }
+    -re "type = long unsigned int &.*$gdb_prompt $"  { pass "ptype rUL" }
     -re ".*$gdb_prompt $"   {  fail "ptype rUL" }
     timeout             { fail "(timeout) ptype rUL" }
 }
@@ -372,7 +373,10 @@ send_gdb "print rS\n"
 gdb_expect {
     -re ".\[0-9\]* = \\(short &\\) @$hex: -14.*$gdb_prompt $" {
         pass "print value of rS"
-      }
+    }
+    -re ".\[0-9\]* = \\(short int &\\) @$hex: -14.*$gdb_prompt $" {
+        pass "print value of rS"
+    }
     -re ".*$gdb_prompt $" { fail "print value of rS" }
     timeout           { fail "(timeout) print value of rS" }
   }
@@ -382,7 +386,10 @@ send_gdb "print rUS\n"
 gdb_expect {
     -re ".\[0-9\]* = \\(unsigned short &\\) @$hex: 7.*$gdb_prompt $" {
         pass "print value of rUS"
-      }
+    }
+    -re ".\[0-9\]* = \\(short unsigned int &\\) @$hex: 7.*$gdb_prompt $" {
+        pass "print value of rUS"
+    }
     -re ".*$gdb_prompt $" { fail "print value of rUS" }
     timeout           { fail "(timeout) print value of rUS" }
   }
@@ -412,7 +419,10 @@ send_gdb "print rL\n"
 gdb_expect {
     -re ".\[0-9\]* = \\(long &\\) @$hex: -234.*$gdb_prompt $" {
         pass "print value of rL"
-      }
+    }
+    -re ".\[0-9\]* = \\(long int &\\) @$hex: -234.*$gdb_prompt $" {
+        pass "print value of rL"
+    }
     -re ".*$gdb_prompt $" { fail "print value of rL" }
     timeout           { fail "(timeout) print value of rL" }
   }
@@ -423,7 +433,10 @@ send_gdb "print rUL\n"
 gdb_expect {
     -re ".\[0-9\]* = \\(unsigned long &\\) @$hex: 234.*$gdb_prompt $" {
         pass "print value of rUL"
-      }
+    }
+    -re ".\[0-9\]* = \\(long unsigned int &\\) @$hex: 234.*$gdb_prompt $" {
+        pass "print value of rUL"
+    }
     -re ".*$gdb_prompt $" { fail "print value of rUL" }
     timeout           { fail "(timeout) print value of rUL" }
   }
diff --git a/gdb/testsuite/gdb.chill/tests1.ch b/gdb/testsuite/gdb.chill/tests1.ch
index b545d07..b6e660f 100644
--- a/gdb/testsuite/gdb.chill/tests1.ch
+++ b/gdb/testsuite/gdb.chill/tests1.ch
@@ -12,7 +12,7 @@
 -- 
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
--- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 -- Please email any bugs, comments, and/or additions to this file to:
 -- bug-gdb@prep.ai.mit.edu
diff --git a/gdb/testsuite/gdb.chill/tests2.ch b/gdb/testsuite/gdb.chill/tests2.ch
index 1596f3b..6d45799 100644
--- a/gdb/testsuite/gdb.chill/tests2.ch
+++ b/gdb/testsuite/gdb.chill/tests2.ch
@@ -12,7 +12,7 @@
 -- 
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
--- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 -- Please email any bugs, comments, and/or additions to this file to:
 -- bug-gdb@prep.ai.mit.edu
diff --git a/gdb/testsuite/gdb.chill/tests2.exp b/gdb/testsuite/gdb.chill/tests2.exp
index 46c4821..315d767 100644
--- a/gdb/testsuite/gdb.chill/tests2.exp
+++ b/gdb/testsuite/gdb.chill/tests2.exp
@@ -12,7 +12,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-gdb@prep.ai.mit.edu
diff --git a/gdb/testsuite/gdb.hp/ambiguous.exp b/gdb/testsuite/gdb.hp/ambiguous.exp
index 5b87af3..0ee3ecb 100644
--- a/gdb/testsuite/gdb.hp/ambiguous.exp
+++ b/gdb/testsuite/gdb.hp/ambiguous.exp
@@ -35,6 +35,8 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "ambiguous"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
@@ -42,9 +44,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } then { continue }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
diff --git a/gdb/testsuite/gdb.hp/attach.exp b/gdb/testsuite/gdb.hp/attach.exp
index 372acd0..b76f04c 100644
--- a/gdb/testsuite/gdb.hp/attach.exp
+++ b/gdb/testsuite/gdb.hp/attach.exp
@@ -34,11 +34,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     #setup_xfail "*-*-*"
diff --git a/gdb/testsuite/gdb.hp/attach2.exp b/gdb/testsuite/gdb.hp/attach2.exp
index e298ee9..84b0e4a 100644
--- a/gdb/testsuite/gdb.hp/attach2.exp
+++ b/gdb/testsuite/gdb.hp/attach2.exp
@@ -29,6 +29,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 # Thread stuff is _slow_; prepare for long waits.
 #
 # Further, this test has some "null" lines designed
diff --git a/gdb/testsuite/gdb.hp/classes-hp.exp b/gdb/testsuite/gdb.hp/classes-hp.exp
index cb22c96..f67a2af 100644
--- a/gdb/testsuite/gdb.hp/classes-hp.exp
+++ b/gdb/testsuite/gdb.hp/classes-hp.exp
@@ -25,6 +25,7 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
 
 # Check to see if we have an executable to test.  If not, then either we
 # haven't tried to compile one, or the compilation failed for some reason.
@@ -37,9 +38,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } then { continue }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
diff --git a/gdb/testsuite/gdb.hp/ctti.exp b/gdb/testsuite/gdb.hp/ctti.exp
index e53210d..7f1fac9 100644
--- a/gdb/testsuite/gdb.hp/ctti.exp
+++ b/gdb/testsuite/gdb.hp/ctti.exp
@@ -29,6 +29,7 @@ if $tracelevel then {
         strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
 
 # Check to see if we have an executable to test.  If not, then either we
 # haven't tried to compile one, or the compilation failed for some reason.
@@ -44,9 +45,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } then { continue }
 
 #if  { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile1} ${srcdir}/${subdir}/${srcfile2} ${srcdir}/${subdir}/${srcfile3}" "${binfile}" executable {debug c++}] != "" } {
 #     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
diff --git a/gdb/testsuite/gdb.hp/dbx.exp b/gdb/testsuite/gdb.hp/dbx.exp
index 66f24e9..340c609 100644
--- a/gdb/testsuite/gdb.hp/dbx.exp
+++ b/gdb/testsuite/gdb.hp/dbx.exp
@@ -22,6 +22,7 @@ if $tracelevel then {
         strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
 
 set testfile1 "average"
 set testfile2 "sum"
@@ -47,7 +48,7 @@ if  { [gdb_compile "${binfile1}.o ${binfile2}.o" ${binfile} executable {debug}]
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 proc dbx_reinitialize_dir { subdir } {
     global gdb_prompt
diff --git a/gdb/testsuite/gdb.hp/exception.exp b/gdb/testsuite/gdb.hp/exception.exp
index 4cafbdc..64ff488 100644
--- a/gdb/testsuite/gdb.hp/exception.exp
+++ b/gdb/testsuite/gdb.hp/exception.exp
@@ -50,6 +50,7 @@ if $tracelevel then {
         strace $tracelevel
         }
 
+if { [skip_hp_tests] } then { continue }
 
 #
 # test running programs
@@ -67,7 +68,7 @@ if [get_compiler_info ${binfile} "c++"] {
 }
  
  
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 set cmdline "$CXX ${srcdir}/${subdir}/${srcfile} +A -Wl,-a,archive -g -o ${binfile}"
 
diff --git a/gdb/testsuite/gdb.hp/foll-exec.exp b/gdb/testsuite/gdb.hp/foll-exec.exp
index f7d6089..59a4ffc 100644
--- a/gdb/testsuite/gdb.hp/foll-exec.exp
+++ b/gdb/testsuite/gdb.hp/foll-exec.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
     #setup_xfail "*-*.*"
diff --git a/gdb/testsuite/gdb.hp/foll-fork.exp b/gdb/testsuite/gdb.hp/foll-fork.exp
index 7231764..fdfc6ed 100644
--- a/gdb/testsuite/gdb.hp/foll-fork.exp
+++ b/gdb/testsuite/gdb.hp/foll-fork.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
     #setup_xfail "*-*.*"
diff --git a/gdb/testsuite/gdb.hp/foll-vfork.exp b/gdb/testsuite/gdb.hp/foll-vfork.exp
index 26c6981..fc5ee4c 100644
--- a/gdb/testsuite/gdb.hp/foll-vfork.exp
+++ b/gdb/testsuite/gdb.hp/foll-vfork.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
     #setup_xfail "*-*.*"
diff --git a/gdb/testsuite/gdb.hp/hwwatchbus.exp b/gdb/testsuite/gdb.hp/hwwatchbus.exp
index d4899a9..f648e36 100644
--- a/gdb/testsuite/gdb.hp/hwwatchbus.exp
+++ b/gdb/testsuite/gdb.hp/hwwatchbus.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     verbose "HPUX h/w watch test ignored for non-hppa or pre-HP/UX-10.30 targets."
diff --git a/gdb/testsuite/gdb.hp/inherit-hp.exp b/gdb/testsuite/gdb.hp/inherit-hp.exp
index 645358e..efa4d70 100644
--- a/gdb/testsuite/gdb.hp/inherit-hp.exp
+++ b/gdb/testsuite/gdb.hp/inherit-hp.exp
@@ -25,6 +25,8 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 # Check to see if we have an executable to test.  If not, then either we
 # haven't tried to compile one, or the compilation failed for some reason.
 # In either case, just notify the user and skip the tests in this file.
@@ -39,7 +41,7 @@ if [get_compiler_info ${binfile} "c++"] {
 }
  
  
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
diff --git a/gdb/testsuite/gdb.hp/more-steps.exp b/gdb/testsuite/gdb.hp/more-steps.exp
index 320a0d6..9972e2d 100644
--- a/gdb/testsuite/gdb.hp/more-steps.exp
+++ b/gdb/testsuite/gdb.hp/more-steps.exp
@@ -26,6 +26,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 #if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
 #    verbose "HPUX thread test ignored for non-hppa or pre-HP/UX-10.30 targets."
 #    return 0
diff --git a/gdb/testsuite/gdb.hp/namespace.exp b/gdb/testsuite/gdb.hp/namespace.exp
index 1708db8..1e52237 100644
--- a/gdb/testsuite/gdb.hp/namespace.exp
+++ b/gdb/testsuite/gdb.hp/namespace.exp
@@ -31,14 +31,11 @@ if $tracelevel then {
         strace $tracelevel
         }
 
-
-#
-# test running programs
-#
-
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "namespace"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
@@ -46,9 +43,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile}] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } then { continue }
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
diff --git a/gdb/testsuite/gdb.hp/optimize.exp b/gdb/testsuite/gdb.hp/optimize.exp
index 34606eb..62fe373 100644
--- a/gdb/testsuite/gdb.hp/optimize.exp
+++ b/gdb/testsuite/gdb.hp/optimize.exp
@@ -29,6 +29,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile optimize
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
@@ -38,7 +40,7 @@ if [get_compiler_info ${binfile}] {
 }
 
  
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 # Vanilla -O, which is the same as +O2
diff --git a/gdb/testsuite/gdb.hp/pxdb.exp b/gdb/testsuite/gdb.hp/pxdb.exp
index c8b3ace..ef34557 100644
--- a/gdb/testsuite/gdb.hp/pxdb.exp
+++ b/gdb/testsuite/gdb.hp/pxdb.exp
@@ -31,6 +31,8 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile pxdb
 set srcfile ${testfile}.c
 set objfile ${objdir}/${subdir}/${testfile}.o
@@ -39,9 +41,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } then { continue }
 
 # To build a non-pxdb-ed file, use
 #
diff --git a/gdb/testsuite/gdb.hp/reg-test.exp b/gdb/testsuite/gdb.hp/reg-test.exp
index 4bdc306..d8b0f16 100644
--- a/gdb/testsuite/gdb.hp/reg-test.exp
+++ b/gdb/testsuite/gdb.hp/reg-test.exp
@@ -26,12 +26,9 @@ if $tracelevel then {
 	strace $tracelevel
 	}
 
-if ![istarget "hppa*-*-*"] {
-    verbose "Wide register test ignored for non-hppa targets."
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
-set testfile "reg_test"
+set testfile "reg-test"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 
diff --git a/gdb/testsuite/gdb.hp/sized-enum.exp b/gdb/testsuite/gdb.hp/sized-enum.exp
index 191050a..5588559 100644
--- a/gdb/testsuite/gdb.hp/sized-enum.exp
+++ b/gdb/testsuite/gdb.hp/sized-enum.exp
@@ -36,6 +36,8 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "sized-enum"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
@@ -44,7 +46,7 @@ if [get_compiler_info ${binfile}] {
     return -1
 }
 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
diff --git a/gdb/testsuite/gdb.hp/so-thresh.exp b/gdb/testsuite/gdb.hp/so-thresh.exp
index 1977e92..1780416 100644
--- a/gdb/testsuite/gdb.hp/so-thresh.exp
+++ b/gdb/testsuite/gdb.hp/so-thresh.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 set testfile "so-thresh"
 set srcfile ${testfile}.c
diff --git a/gdb/testsuite/gdb.hp/start-stop.exp b/gdb/testsuite/gdb.hp/start-stop.exp
index 4f70f51..cb64aa6 100644
--- a/gdb/testsuite/gdb.hp/start-stop.exp
+++ b/gdb/testsuite/gdb.hp/start-stop.exp
@@ -54,6 +54,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     verbose "HPUX thread test ignored for non-hppa or pre-HP/UX-10.30 targets."
     return 0
diff --git a/gdb/testsuite/gdb.hp/templ-hp.exp b/gdb/testsuite/gdb.hp/templ-hp.exp
index 64ca53d..5cdf0a1 100644
--- a/gdb/testsuite/gdb.hp/templ-hp.exp
+++ b/gdb/testsuite/gdb.hp/templ-hp.exp
@@ -33,6 +33,8 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "templ-hp"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
@@ -46,7 +48,7 @@ if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
diff --git a/gdb/testsuite/gdb.hp/thr-lib.exp b/gdb/testsuite/gdb.hp/thr-lib.exp
index 53bf466..e40b469 100644
--- a/gdb/testsuite/gdb.hp/thr-lib.exp
+++ b/gdb/testsuite/gdb.hp/thr-lib.exp
@@ -50,6 +50,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     verbose "HPUX thread test ignored for non-hppa or pre-HP/UX-10.30 targets."
     return 0
diff --git a/gdb/testsuite/gdb.hp/thr-stg.exp b/gdb/testsuite/gdb.hp/thr-stg.exp
index 19d69ee..7fc7a93 100644
--- a/gdb/testsuite/gdb.hp/thr-stg.exp
+++ b/gdb/testsuite/gdb.hp/thr-stg.exp
@@ -50,6 +50,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     verbose "HPUX thread test ignored for non-hppa or pre-HP/UX-10.30 targets."
     return 0
diff --git a/gdb/testsuite/gdb.hp/virtfun-hp.exp b/gdb/testsuite/gdb.hp/virtfun-hp.exp
index f5b3637..2b3ee59 100644
--- a/gdb/testsuite/gdb.hp/virtfun-hp.exp
+++ b/gdb/testsuite/gdb.hp/virtfun-hp.exp
@@ -25,6 +25,8 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "virtfun-hp"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
@@ -32,9 +34,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } then { continue }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
diff --git a/gdb/testsuite/gdb.hp/watch-cmd.exp b/gdb/testsuite/gdb.hp/watch-cmd.exp
index a7e3b5c..236af71 100644
--- a/gdb/testsuite/gdb.hp/watch-cmd.exp
+++ b/gdb/testsuite/gdb.hp/watch-cmd.exp
@@ -27,6 +27,8 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "run-hp"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
@@ -35,11 +37,6 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 
 }
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
-
 if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
     #setup_xfail "*-*.*"
     return 0
@@ -48,7 +45,7 @@ if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.hp/watch-hp.exp b/gdb/testsuite/gdb.hp/watch-hp.exp
index a1c3fc8..068c1b7 100644
--- a/gdb/testsuite/gdb.hp/watch-hp.exp
+++ b/gdb/testsuite/gdb.hp/watch-hp.exp
@@ -23,6 +23,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 set prms_id 0
 set bug_id 0
 
@@ -36,7 +38,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 # Prepare for watchpoint tests by setting up two breakpoints and one
 # watchpoint.
diff --git a/gdb/testsuite/gdb.hp/xdb1.exp b/gdb/testsuite/gdb.hp/xdb1.exp
index 88ab2fc..f371852 100644
--- a/gdb/testsuite/gdb.hp/xdb1.exp
+++ b/gdb/testsuite/gdb.hp/xdb1.exp
@@ -23,6 +23,7 @@ if $tracelevel then {
         strace $tracelevel
         }
 
+if { [skip_hp_tests] } then { continue }
 
 global usestubs
 
@@ -42,7 +43,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 global GDBFLAGS
 set saved_gdbflags $GDBFLAGS
diff --git a/gdb/testsuite/gdb.hp/xdb2.exp b/gdb/testsuite/gdb.hp/xdb2.exp
index 4cc7b34..9bcdf58 100644
--- a/gdb/testsuite/gdb.hp/xdb2.exp
+++ b/gdb/testsuite/gdb.hp/xdb2.exp
@@ -23,6 +23,8 @@ if $tracelevel then {
         strace $tracelevel
         }
 
+if { [skip_hp_tests] } then { continue }
+
 global message
 
 #
@@ -49,12 +51,11 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}]
     return -1
 }
 
-
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
 
+if { $gcc_compiled } then { continue }
 
 global GDBFLAGS
 set saved_gdbflags $GDBFLAGS
diff --git a/gdb/testsuite/gdb.hp/xdb3.exp b/gdb/testsuite/gdb.hp/xdb3.exp
index cf569e9..36c3ec9 100644
--- a/gdb/testsuite/gdb.hp/xdb3.exp
+++ b/gdb/testsuite/gdb.hp/xdb3.exp
@@ -22,6 +22,7 @@ if $tracelevel then {
         strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
 
 set testfile1 "average"
 set testfile2 "sum"
@@ -45,7 +46,7 @@ if  { [gdb_compile "${binfile1}.o ${binfile2}.o" ${binfile} executable {debug}]
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 proc xdb_reinitialize_dir { subdir } {
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index 86ac7a6..51573cc 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -277,6 +277,12 @@ if { [lindex $exec_output 0] != 0 } {
     return -1
 }
 
+# HP's assembler has no idea of what to do with .stab directives; detect the
+# use of HP compilers and escape from here.  (No doubt a better heuristic
+# could be devised.)
+
+if { [ info exists CC ] && [ string first "/opt/ansic/bin/cc" "$CC" ] >= 0 } then { continue }
+
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c61abb6..0e9bd29 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1994, 1995, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1994, 1995, 1997, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -313,6 +313,7 @@ proc runto_main { } {
     return 1
 }
 
+
 # gdb_test COMMAND PATTERN MESSAGE -- send a command to gdb; test the result.
 #
 # COMMAND is the command to execute, send to GDB with send_gdb.  If
@@ -834,13 +835,11 @@ proc skip_chill_tests {} {
     return $skip_chill
 }
 
-# skip all the tests in the file if you are not on an hppa running hpux target.
-# and you compiled with gcc
-proc skip_hp_tests {gcc_used} {
-  #  if ![info exists do_hp_tests] {
-  #	return 1;
-  #  }
-    eval set skip_hp [expr ![isnative] || ![istarget "hppa*-*-hpux*"] || $gcc_used!=0 ]
+# Skip all the tests in the file if you are not on an hppa running
+# hpux target.
+
+proc skip_hp_tests {} {
+    eval set skip_hp [ expr ![isnative] || ![istarget "hppa*-*-hpux*"] ]
     verbose "Skip hp tests is $skip_hp"
     return $skip_hp
 }
@@ -1160,6 +1159,7 @@ proc gdb_finish { } {
 }
 
 global debug_format
+set debug_format "unknown"
 
 # Run the gdb command "info source" and extract the debugging format
 # information from the output and save it in debug_format.
@@ -1331,4 +1331,51 @@ proc gdb_get_line_number {text {file /omitted/}} {
     return $result;
 }
 
+# gdb_continue_to_end:
+#	The case where the target uses stubs has to be handled specially. If a
+#       stub is used, we set a breakpoint at exit because we cannot rely on
+#       exit() behavior of a remote target.
+# 
+# mssg is the error message that gets printed.
+
+proc gdb_continue_to_end {mssg} {
+  if [target_info exists use_gdb_stub] {
+    if {![gdb_breakpoint "exit"]} {
+      return 0
+    }
+    gdb_test "continue" "Continuing..*Breakpoint .*exit.*" \
+      "continue until exit at $mssg"
+  } else {
+    # Continue until we exit.  Should not stop again.
+    # Don't bother to check the output of the program, that may be
+    # extremely tough for some remote systems.
+    gdb_test "continue"\
+      "Continuing.\[\r\n0-9\]+Program exited normally\\..*"\
+      "continue until exit at $mssg"
+  }
+}
+
+proc rerun_to_main {} {
+  global gdb_prompt
+
+  if [target_info exists use_gdb_stub] {
+    gdb_run_cmd
+    gdb_expect {
+      -re ".*Breakpoint .*main .*$gdb_prompt $"\
+	      {pass "rerun to main" ; return 0}
+      -re "$gdb_prompt $"\
+	      {fail "rerun to main" ; return 0}
+      timeout {fail "(timeout) rerun to main" ; return 0}
+    }
+  } else {
+    send_gdb "run\n"
+    gdb_expect {
+      -re "Starting program.*$gdb_prompt $"\
+	      {pass "rerun to main" ; return 0}
+      -re "$gdb_prompt $"\
+	      {fail "rerun to main" ; return 0}
+      timeout {fail "(timeout) rerun to main" ; return 0}
+    }
+  }
+}