From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30959 invoked by alias); 18 Apr 2008 19:09:51 -0000 Received: (qmail 30934 invoked by uid 9112); 18 Apr 2008 19:09:51 -0000 Date: Fri, 18 Apr 2008 19:09:00 -0000 Message-ID: <20080418190951.30916.qmail@sourceware.org> From: mark@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Enable TestDisplayCommand and adjust to new actions syntax. Solves bug #4982. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9072e069746c0f4d1a10c00482971fa0b4f1fd09 X-Git-Newrev: 1c65982254c28f61fc7b1fe47a74e93edf876953 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-q2/txt/msg00141.txt.bz2 The branch, master has been updated via 1c65982254c28f61fc7b1fe47a74e93edf876953 (commit) from 9072e069746c0f4d1a10c00482971fa0b4f1fd09 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 1c65982254c28f61fc7b1fe47a74e93edf876953 Author: Mark Wielaard Date: Fri Apr 18 21:06:46 2008 +0200 Enable TestDisplayCommand and adjust to new actions syntax. Solves bug #4982. frysk-core/frysk/hpd/ChangeLog 2008-04-18 Mark Wielaard * TestDisplayCommand.java: Don't mark unresolved. Adjust to new actionpoints -> actions command syntax. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 5 ++++ frysk-core/frysk/hpd/TestDisplayCommand.java | 33 +++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index b48eb6e..633e5dc 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,8 @@ +2008-04-18 Mark Wielaard + + * TestDisplayCommand.java: Don't mark unresolved. Adjust to new + actionpoints -> actions command syntax. + 2008-04-18 Rick Moseley * StartRun.java: Fix bug in TestSysRoot introduced by diff --git a/frysk-core/frysk/hpd/TestDisplayCommand.java b/frysk-core/frysk/hpd/TestDisplayCommand.java index f89d43f..d71c2f9 100644 --- a/frysk-core/frysk/hpd/TestDisplayCommand.java +++ b/frysk-core/frysk/hpd/TestDisplayCommand.java @@ -43,38 +43,33 @@ public class TestDisplayCommand extends TestLib { public void testHpdDisplayCommands() { - if (unresolved(4941)) - return; - e = HpdTestbed.run("funit-rt-varchange"); + e = HpdTestbed.load("funit-rt-varchange"); + e.send("start\n"); + e.expect("starting with this commmand.*" + prompt); + // Break - // FIXME: 4941 - try { Thread.sleep(2000); } catch(Exception e) {} - e.send("break #funit-rt-varchange.c#53\n"); e.expect("breakpoint.*" + prompt); e.send("go\n"); e.expect("go.*" + prompt + ".*Breakpoint.*#funit-rt-varchange.c#53.*"); - // FIXME: 4941 - try { Thread.sleep(2000); } catch(Exception e) {} - e.send("display x\n"); e.expect("display.*1:.*x = .*" + prompt); e.send("display y*2\n"); e.expect("display.*2:.*y*2 = .*" + prompt); - e.send("actionpoints -display\n"); - e.expect("actionpoints.*DISPLAYS.*2.*y.*\"y.*\".*\n1.*y.*\"x\".*" + e.send("actions -display\n"); + e.expect("actions.*DISPLAYS.*2.*y.*\"y.*\".*\n1.*y.*\"x\".*" + prompt); e.send("disable 1\n"); e.expect("disable.*display 1 disabled.*" + prompt); - e.send("actionpoints -display\n"); - e.expect("actionpoints.*DISPLAYS.*2.*y.*\"y.*\".*\n1.*n.*\"x\".*" + e.send("actions -display\n"); + e.expect("actions.*DISPLAYS.*2.*y.*\"y.*\".*\n1.*n.*\"x\".*" + prompt); e.send("disable -display\n"); e.expect("disable.*display 2 disabled.*" + prompt); - e.send("actionpoints -display\n"); - e.expect("actionpoints.*DISPLAYS.*2.*n.*\"y.*\".*\n1.*n.*\"x\".*" + e.send("actions -display\n"); + e.expect("actions.*DISPLAYS.*2.*n.*\"y.*\".*\n1.*n.*\"x\".*" + prompt); e.send("enable 2\n"); e.expect("enable.*display 2 enabled.*" + prompt); @@ -82,12 +77,12 @@ public class TestDisplayCommand e.expect("enable.*display 1 enabled.*" + prompt); e.send("delete 1\n"); e.expect("delete.*display 1 deleted.*" + prompt); - e.send("actionpoints -display\n"); - e.expect("actionpoints.*DISPLAYS.*2.*y.*\"y.*\".*" + prompt); + e.send("actions -display\n"); + e.expect("actions.*DISPLAYS.*2.*y.*\"y.*\".*" + prompt); e.send("delete -display\n"); e.expect("delete.*display 2 deleted.*" + prompt); - e.send("actionpoints -display\n"); - e.expect("actionpoints.*" + prompt); + e.send("actions -display\n"); + e.expect("actions.*" + prompt); e.send("quit\n"); e.expect("Quitting..."); e.close(); hooks/post-receive -- frysk system monitor/debugger