From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30434 invoked by alias); 25 Jan 2008 21:52:00 -0000 Received: (qmail 30408 invoked by uid 9519); 25 Jan 2008 21:51:59 -0000 Date: Fri, 25 Jan 2008 21:52:00 -0000 Message-ID: <20080125215159.30390.qmail@sourceware.org> From: rmoseley@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Change e.send to e.sendCommandExpectPrompt. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f175568bca99954e9f1554945a194e65224e1954 X-Git-Newrev: 18dc1f26e74c45f1a2a00d617beb2eecf6689353 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/msg00134.txt.bz2 The branch, master has been updated via 18dc1f26e74c45f1a2a00d617beb2eecf6689353 (commit) from f175568bca99954e9f1554945a194e65224e1954 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 18dc1f26e74c45f1a2a00d617beb2eecf6689353 Author: Rick Moseley Date: Fri Jan 25 15:51:42 2008 -0600 Change e.send to e.sendCommandExpectPrompt. * TestHpdTestHarness.java: Change e.send to e.sendCommandExpectPrompt. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 3 ++ frysk-core/frysk/hpd/TestHpdTestHarness.java | 46 ++++++++++++++++---------- 2 files changed, 31 insertions(+), 18 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index d26d0f7..6fd6fab 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,6 +1,9 @@ 2008-01-25 Rick Moseley * TestHpdTestHarness.java: Fix pattern matches. + + + * TestHpdTestHarness.java: Change e.send to e.sendCommandExpectPrompt. 2008-01-25 Andrew Cagney diff --git a/frysk-core/frysk/hpd/TestHpdTestHarness.java b/frysk-core/frysk/hpd/TestHpdTestHarness.java index 73bcfaa..ff8fc72 100644 --- a/frysk-core/frysk/hpd/TestHpdTestHarness.java +++ b/frysk-core/frysk/hpd/TestHpdTestHarness.java @@ -1,6 +1,6 @@ // This file is part of the program FRYSK. // -// Copyright 2007 Red Hat Inc. +// Copyright 2007, 2008 Red Hat Inc. // // FRYSK is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by @@ -47,24 +47,34 @@ public class TestHpdTestHarness extends TestLib { if (unresolved(5480)) return; e = new HpdTestbed(); - e.send("load " + Config.getPkgLibFile("funit-threads-looper").getPath() - + "\n"); - e.expect("Loaded executable file.*"); + //e.send("load " + Config.getPkgLibFile("funit-threads-looper").getPath() + // + "\n"); + e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + "Loaded executable file.*"); + //e.expect("Loaded executable file.*"); e.send("run\n"); - e.expect("Attached to process.*"); - e.send("go\n"); - e.expect("Running process.*"); - e.send("kill\n"); - e.expect("Killing process.*"); - e.expect("Loaded executable file.*"); - e.send("run\n"); - e.expect("Attached to process.*"); - e.send("go\n"); - e.expect("Running process*"); - e.send("kill\n"); - e.expect("Killing process.*"); - e.expect("Loaded executable file.*"); - e.expect("quit\n"); + e.sendCommandExpectPrompt("run", "Attached to process.*starting/running.*" ); + //e.expect("Attached to process.*"); + //e.expect("starting/running.*"); + //e.send("go\n"); + e.sendCommandExpectPrompt("go", "Running process.*"); + //e.expect("Running process.*"); + //e.send("kill\n"); + e.sendCommandExpectPrompt("kill", "Killing process.*Loaded executable file.*"); + //e.expect("Killing process.*"); + //e.expect("Loaded executable file.*"); + //e.send("run\n"); + e.sendCommandExpectPrompt("run", "Attached to process.*starting/running.*"); + //e.expect("Attached to process.*"); + //e.expect("starting/running.*"); + //e.send("go\n"); + e.sendCommandExpectPrompt("go", "Running process.*"); + //e.expect("Running process*"); + //e.send("kill\n"); + e.sendCommandExpectPrompt("kill","Killing process.*Loaded executable file.*"); + //e.expect("Killing process.*"); + //e.expect("Loaded executable file.*"); + e.send("quit\n"); e.expect("Quitting\\.\\.\\."); } } hooks/post-receive -- frysk system monitor/debugger