From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31586 invoked by alias); 29 May 2008 19:25:41 -0000 Received: (qmail 31552 invoked by uid 9519); 29 May 2008 19:25:41 -0000 Date: Thu, 29 May 2008 19:25:00 -0000 Message-ID: <20080529192541.31537.qmail@sourceware.org> From: rmoseley@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Fix bz #6576, fix load command not setting path-to-executable correctly. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: fe7c57831ee38bef5c6157ba384627587e97da39 X-Git-Newrev: c809d4bc691f791e7c875d841ad3e26ccc7e1d4b 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/msg00305.txt.bz2 The branch, master has been updated via c809d4bc691f791e7c875d841ad3e26ccc7e1d4b (commit) from fe7c57831ee38bef5c6157ba384627587e97da39 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit c809d4bc691f791e7c875d841ad3e26ccc7e1d4b Author: Rick Moseley Date: Thu May 29 14:23:50 2008 -0500 Fix bz #6576, fix load command not setting path-to-executable correctly. * LoadCommand.java: Fix invalid setting of path-to-executable. * TestRunCommand.java: Fix bz #6576 that adds test for change to LoadCommand above. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 5 +++++ frysk-core/frysk/hpd/LoadCommand.java | 4 +++- frysk-core/frysk/hpd/TestRunCommand.java | 11 ++--------- 3 files changed, 10 insertions(+), 10 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index 5f65fca..7716747 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -15,6 +15,11 @@ * TestStartCommand.java: Add tests for above changes. * TestDisplayCommand.java: Fix message testing. * TestFhpdStepping.java: Ditto. + + * LoadCommand.java: Fix invalid setting of + path-to-executable. + * TestRunCommand.java: Fix bz #6576 that adds test + for change to LoadCommand above. 2008-05-28 Teresa Thomas diff --git a/frysk-core/frysk/hpd/LoadCommand.java b/frysk-core/frysk/hpd/LoadCommand.java index ad65dc5..845ca45 100644 --- a/frysk-core/frysk/hpd/LoadCommand.java +++ b/frysk-core/frysk/hpd/LoadCommand.java @@ -153,8 +153,10 @@ public class LoadCommand extends ParameterizedCommand { synchronized (cli) { cli.loadedProcs.put(new Integer(procID), exeProc.getExeFile().getSysRootedPath()); - if (params != null) + if (params != null) { + params[0] = exeProc.getExeFile().getSysRootedPath(); cli.ptsetParams.put(new Integer(procID), params); + } else { String[] command = { exeProc.getExeFile().getSysRootedPath() }; cli.ptsetParams.put(new Integer(procID), command); diff --git a/frysk-core/frysk/hpd/TestRunCommand.java b/frysk-core/frysk/hpd/TestRunCommand.java index 625724c..e324e1d 100644 --- a/frysk-core/frysk/hpd/TestRunCommand.java +++ b/frysk-core/frysk/hpd/TestRunCommand.java @@ -281,15 +281,8 @@ public class TestRunCommand extends TestLib { } public void testFhpdLoadedParams() { - if(unresolved(6576)) - return; - /*String[] command = new String[] {Prefix.pkgLibFile("funit-parameters").getPath(), - "zzz", - "yyy"}; - e = new HpdTestbed(command); - //e = new HpdTestbed(Prefix.pkgLibFile("funit-parameters").getPath() + " zzz yyy", - // "Loaded executable file.*funit-parameters.*"); + e = HpdTestbed.load("funit-parameters zzz yyy"); e.sendCommandExpectPrompt("run", "running.*zzz yyy.*" + "Attached to process ([0-9]+).*" + "Running process ([0-9]+).*"); try { Thread.sleep(500); } catch (Exception e) {} @@ -300,6 +293,6 @@ public class TestRunCommand extends TestLib { "Attached to process ([0-9]+).*" + "Running process ([0-9]+).*"); e.send("quit\n"); e.expect("Quitting\\.\\.\\."); - e.close(); */ + e.close(); } } \ No newline at end of file hooks/post-receive -- frysk system monitor/debugger