help: dejagnu stumps me again

[Daniel Jacobowitz <drow@mvista.com>]

I'm really not fond of TCL...

If someone could tell me the problem with the following patch, I'd be deeply
in their debt.  I've spent several hours on this and the companion (failure
of the ^C handling in annota2.exp, which can be cured by putting a "shell
echo" in front of it.  I've no idea if GDB or Expect is at fault and I can't
figure it out.  My suspicion is GDB.)

This patch causes the testsuite to hang for a while.  After it times out,
both the sent message and expected response appear.  Changing -ex to -re
makes no difference.

-- 
Daniel Jacobowitz                           Carnegie Mellon University
MontaVista Software                         Debian GNU/Linux Developer

Index: demangle.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/demangle.exp,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 demangle.exp
--- demangle.exp	1999/09/09 00:00:27	1.1.1.4
+++ demangle.exp	2002/01/10 03:42:29
@@ -531,7 +531,18 @@
     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\""
+    # Accept even a dubious demangling; the string is ambiguous.
+    send_gdb "maintenance demangle __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator\n"
+    gdb_expect {
+	-ex "virtual function thunk (delta:-64) for CosNaming::_proxy_NamingContext::_0RL__list(unsigned long, _CORBA_Unbounded_Sequence<CosNaming::Binding> *&, CosNaming::BindingIterator *&)"
+		{ pass "gnu: __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator" }
+	-ex "Can't demangle \"__thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator\""
+		{ pass "gnu: __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator" }
+	-re ".*$gdb_prompt $"
+		{ fail "gnu: __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator" }
+	timeout
+		{ fail "gnu: __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator (timeout)" }
+    }
 }
 
 #