From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25172 invoked by alias); 11 Jun 2008 20:42:50 -0000 Received: (qmail 25146 invoked by uid 9519); 11 Jun 2008 20:42:49 -0000 Date: Wed, 11 Jun 2008 20:42:00 -0000 Message-ID: <20080611204249.25131.qmail@sourceware.org> From: rmoseley@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Fix bz #6614 (testing with TestCoreCommand) X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 33239fb5159db92b6e4df94c2c5dc27113ff98ae X-Git-Newrev: e9ea00b225af9daaeb8e705d750c1331b912976a 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/msg00370.txt.bz2 The branch, master has been updated via e9ea00b225af9daaeb8e705d750c1331b912976a (commit) from 33239fb5159db92b6e4df94c2c5dc27113ff98ae (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit e9ea00b225af9daaeb8e705d750c1331b912976a Author: Rick Moseley Date: Wed Jun 11 15:40:31 2008 -0500 Fix bz #6614 (testing with TestCoreCommand) * TestCoreCommand.java: Add test for passing parameters. * CorefileFactory.java: Change to call DaemonBlockedAtEntry. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 4 ++++ frysk-core/frysk/hpd/TestCoreCommand.java | 9 +++------ frysk-core/frysk/testbed/ChangeLog | 5 +++++ frysk-core/frysk/testbed/CorefileFactory.java | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index b7dd24d..a0daee0 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,7 @@ +2008-06-11 Rick Moseley + + * TestCoreCommand.java: Fix bz #6614. + 2008-06-11 Teresa Thomas * TestWatchCommand.java (testWatchArraySlice): New test. diff --git a/frysk-core/frysk/hpd/TestCoreCommand.java b/frysk-core/frysk/hpd/TestCoreCommand.java index 0722d8b..5179d6d 100644 --- a/frysk-core/frysk/hpd/TestCoreCommand.java +++ b/frysk-core/frysk/hpd/TestCoreCommand.java @@ -111,14 +111,11 @@ public class TestCoreCommand extends TestLib { public void testCoreLoadedParamsTwo() { - if (unresolved(6614)) - return; -// File exe = new File("/bin/echo"); - File exe = Prefix.pkgLibFile("funit-hello"); - File core = CorefileFactory.constructCoreAtSignal(exe, new String[] {"abcd"}); + File exe = new File("/bin/echo"); + File core = CorefileFactory.constructCoreAtEntry(exe, new String[] {"abcd"}); e = new HpdTestbed(); e.sendCommandExpectPrompt("core " + core.getPath(), "Attached to core.*"); - e.sendCommandExpectPrompt("info args", "output"); + e.sendCommandExpectPrompt("info args", "abcd.*"); e.sendCommandExpectPrompt("run", "running.*abcd.*" + "Attached to process ([0-9]+).*" + "Running process ([0-9]+).*"); e.send("quit\n"); diff --git a/frysk-core/frysk/testbed/ChangeLog b/frysk-core/frysk/testbed/ChangeLog index 4952a98..90aee82 100644 --- a/frysk-core/frysk/testbed/ChangeLog +++ b/frysk-core/frysk/testbed/ChangeLog @@ -1,3 +1,8 @@ +2008-06-11 Rick Moseley + + * CorefileFactory.java: Change method to call + DaemonBlockedAtEntry instead of DaemonBlockedAtSignal. + 2008-06-10 Rick Moseley * CorefileFactory.java: Add method to pass args. diff --git a/frysk-core/frysk/testbed/CorefileFactory.java b/frysk-core/frysk/testbed/CorefileFactory.java index ad305ed..571869d 100644 --- a/frysk-core/frysk/testbed/CorefileFactory.java +++ b/frysk-core/frysk/testbed/CorefileFactory.java @@ -80,13 +80,13 @@ public class CorefileFactory extends TestLib { * then extracts a corefile at that point, and return a File * representing that core file. */ - public static File constructCoreAtSignal(File exeFile, String[] args) { + public static File constructCoreAtEntry(File exeFile, String[] args) { String[] newargs = new String[args.length + 1]; newargs[0] = exeFile.getAbsolutePath(); for (int i = 0; i < args.length; i++) newargs[i+1] = args[i]; final Proc ackProc - = new DaemonBlockedAtSignal(newargs).getMainTask().getProc(); + = new DaemonBlockedAtEntry(newargs).getMainTask().getProc(); return constructCore(ackProc); } hooks/post-receive -- frysk system monitor/debugger