[SCM] master: Fix bz #6576, fix load command not setting path-to-executable correctly.

[rmoseley@sourceware.org]

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 <rmoseley@dhcp-215.hsv.redhat.com>
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  <tthomas@redhat.com>
 
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