From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17857 invoked by alias); 25 Jan 2008 00:02:33 -0000 Received: (qmail 17826 invoked by uid 367); 25 Jan 2008 00:02:32 -0000 Date: Fri, 25 Jan 2008 00:02:00 -0000 Message-ID: <20080125000232.17811.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Cleanup TestFhd.java. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 2e243654a18792a02b13c4ffa90261c5aa1867d7 X-Git-Newrev: 8611edff5032e4510277be420ceeb7f8ea496c47 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/msg00123.txt.bz2 The branch, master has been updated via 8611edff5032e4510277be420ceeb7f8ea496c47 (commit) from 2e243654a18792a02b13c4ffa90261c5aa1867d7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 8611edff5032e4510277be420ceeb7f8ea496c47 Author: Andrew Cagney Date: Thu Jan 24 19:01:55 2008 -0500 Cleanup TestFhd.java. frysk-core/frysk/bindir/ChangeLog 2008-01-24 Andrew Cagney * TestFhd.java: Do not call Expect.close(); do not hard-wire a timeout. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/bindir/ChangeLog | 5 +++++ frysk-core/frysk/bindir/TestFhd.java | 33 +++++++++++++++------------------ 2 files changed, 20 insertions(+), 18 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog index 426ffe9..179ded3 100644 --- a/frysk-core/frysk/bindir/ChangeLog +++ b/frysk-core/frysk/bindir/ChangeLog @@ -1,3 +1,8 @@ +2008-01-24 Andrew Cagney + + * TestFhd.java: Do not call Expect.close(); do not hard-wire a + timeout. + 2008-01-24 Stan Cox * fhpd.java (main): Pass sysroot to request via -sysroot option. diff --git a/frysk-core/frysk/bindir/TestFhd.java b/frysk-core/frysk/bindir/TestFhd.java index 0749af7..1b02a95 100755 --- a/frysk-core/frysk/bindir/TestFhd.java +++ b/frysk-core/frysk/bindir/TestFhd.java @@ -50,35 +50,32 @@ import frysk.expunit.Expect; */ public class TestFhd extends TestLib { - String prompt = "\\(fhpd\\) "; - + private final String prompt = "\\(fhpd\\) "; + public void testHpdPid () { child = new Expect(Config.getPkgLibFile("hpd-c")); e = new Expect(new String[] { - Config.getBinFile("fhpd").getPath(), - child.getPid().toString() - }); - e.expect(5, "Attached to process.*\n" + prompt); - e.close(); + Config.getBinFile("fhpd").getPath(), + child.getPid().toString() + }); + e.expect("Attached to process.*\n" + prompt); } public void testHpdCommand () { e = new Expect(new String[] { - Config.getBinFile("fhpd").getPath(), - Config.getPkgLibFile("hpd-c").getPath() - }); - e.expect(5, "Loaded executable file.*" + prompt); - e.close(); + Config.getBinFile("fhpd").getPath(), + Config.getPkgLibFile("hpd-c").getPath() + }); + e.expect("Loaded executable file.*" + prompt); } public void testHpdCore () { e = new Expect(new String[] { - Config.getBinFile("fhpd").getPath(), - Config.getPkgDataFile("test-core-x86").getPath(), - "-noexe" - }); - e.expect(5, "Attached to core file.*"); - e.close(); + Config.getBinFile("fhpd").getPath(), + Config.getPkgDataFile("test-core-x86").getPath(), + "-noexe" + }); + e.expect("Attached to core file.*"); } } hooks/post-receive -- frysk system monitor/debugger