Re: Patch for PR 5809

[Mark Wielaard <mark@klomp.org>]

Hi,

On Wed, 2008-03-05 at 19:14 +0100, Mark Wielaard wrote:
> Yeah, there should have been written a testcase when this code was
> changed. I created one that fails before and succeeds after your patch
> (attached).

Here is a slightly better one that has tighter regexps for the expect
output. The original could sometimes gobble up too much output
through .* if it was already available. This expects the output more
stricly by explicitly matching the \r\n at the end of line output that
fhpd does.

frysk-core/frysk/hpd/ChangeLog
2008-03-10  Mark Wielaard  <mwielaard@redhat.com>
 
    * TestActionsCommand: Use tighter expect regular expressions.

Cheers,

Mark


diff --git a/frysk-core/frysk/hpd/TestActionsCommand.java b/frysk-core/frysk/hpd
index a01b9e8..b72be4d 100644
--- a/frysk-core/frysk/hpd/TestActionsCommand.java
+++ b/frysk-core/frysk/hpd/TestActionsCommand.java
@@ -47,15 +47,15 @@ public class TestActionsCommand extends TestLib {
       hpd = HpdTestbed.load("funit-hello");
 
       hpd.send("break print\n");
-      hpd.expect("breakpoint.*\n" + prompt);
+      hpd.expect("breakpoint 0 deferred\r\n" + prompt);
 
       hpd.send("run\n");
-      hpd.expect("Breakpoint 0.*\n");
+      hpd.expect("Breakpoint 0 print 0x[0-9a-f]+\r\n");
 
-      hpd.send("actions\n");
-      hpd.expect("actions.*\n");
-      hpd.expect("BREAKPOINTS.*\n");
-      hpd.expect("0  y print [0-9]+.*\n");
+      hpd.send("actions\r\n");
+      hpd.expect("actions\r\n");
+      hpd.expect("BREAKPOINTS\r\n");
+      hpd.expect("0  y print [0-9]+ \r\n");
 
       hpd.send("quit\n");
       hpd.expect("quit.*\nQuitting...");