From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10128 invoked by alias); 10 Mar 2008 10:16:20 -0000 Received: (qmail 10103 invoked by uid 9112); 10 Mar 2008 10:16:19 -0000 Date: Mon, 10 Mar 2008 10:16:00 -0000 Message-ID: <20080310101619.10088.qmail@sourceware.org> From: mark@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Use tighter expect regexps for TestActionsCommand. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 85feab572e96da7c994cb2e0742333cc7c9a2750 X-Git-Newrev: 83c4a9ba95be174298836adf0536cbb734051e56 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00316.txt.bz2 The branch, master has been updated via 83c4a9ba95be174298836adf0536cbb734051e56 (commit) from 85feab572e96da7c994cb2e0742333cc7c9a2750 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 83c4a9ba95be174298836adf0536cbb734051e56 Author: Mark Wielaard Date: Mon Mar 10 11:09:58 2008 +0100 Use tighter expect regexps for TestActionsCommand. frysk-core/frysk/hpd/ChangeLog 2008-03-10 Mark Wielaard * TestActionsCommand: Use tighter expect regular expressions. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 4 ++++ frysk-core/frysk/hpd/TestActionsCommand.java | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index 56bc031..be519b5 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,5 +1,9 @@ 2008-03-10 Mark Wielaard + * TestActionsCommand: Use tighter expect regular expressions. + +2008-03-10 Mark Wielaard + * TestListCommand (testListFrames): Mark unresolved bug #5901 . 2008-03-07 Teresa Thomas diff --git a/frysk-core/frysk/hpd/TestActionsCommand.java b/frysk-core/frysk/hpd/TestActionsCommand.java 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..."); hooks/post-receive -- frysk system monitor/debugger