public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: * LoadCommand.java: Add target set to output line.
@ 2008-03-14 20:58 rmoseley
0 siblings, 0 replies; only message in thread
From: rmoseley @ 2008-03-14 20:58 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via 710ede96339be6993d5d94043672258e1a5b24eb (commit)
from 22d29b98514df505cd9677caf63d9629499a3590 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 710ede96339be6993d5d94043672258e1a5b24eb
Author: Rick Moseley <rmoseley@localhost.localdomain>
Date: Fri Mar 14 15:58:18 2008 -0500
* LoadCommand.java: Add target set to output line.
* TestLoadCommand.java: Add test for above.
* TestRunCommand.java: Ditto.
* TestStartCommand.java: Ditto.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/hpd/ChangeLog | 7 +++++++
frysk-core/frysk/hpd/LoadCommand.java | 3 ++-
frysk-core/frysk/hpd/TestLoadCommand.java | 14 +++++++-------
frysk-core/frysk/hpd/TestRunCommand.java | 14 +++++++-------
frysk-core/frysk/hpd/TestStartCommand.java | 4 ++--
5 files changed, 25 insertions(+), 17 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 0f1caa9..3e5d541 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-14 Rick Moseley <rmoseley@redhat.com>
+
+ * LoadCommand.java: Add target set to output line.
+ * TestLoadCommand.java: Add test for above.
+ * TestRunCommand.java: Ditto.
+ * TestStartCommand.java: Ditto.
+
2008-03-14 Andrew Cagney <cagney@redhat.com>
* UnloadCommand.java: Do not call Host.remove(Proc).
diff --git a/frysk-core/frysk/hpd/LoadCommand.java b/frysk-core/frysk/hpd/LoadCommand.java
index 0cb3998..f3b2217 100644
--- a/frysk-core/frysk/hpd/LoadCommand.java
+++ b/frysk-core/frysk/hpd/LoadCommand.java
@@ -145,7 +145,8 @@ public class LoadCommand extends ParameterizedCommand {
cli.getLoadedProcs().put(exeProc, new Integer(procID));
}
- cli.addMessage("Loaded executable file: " + exeProc.getExe(), Message.TYPE_NORMAL);
+ cli.addMessage("[" + procID + ".0] Loaded executable file: " +
+ exeProc.getExe(), Message.TYPE_NORMAL);
}
int completer(CLI cli, Input input, int cursor, List completions) {
diff --git a/frysk-core/frysk/hpd/TestLoadCommand.java b/frysk-core/frysk/hpd/TestLoadCommand.java
index 2903c4b..81fab20 100644
--- a/frysk-core/frysk/hpd/TestLoadCommand.java
+++ b/frysk-core/frysk/hpd/TestLoadCommand.java
@@ -51,7 +51,7 @@ public class TestLoadCommand extends TestLib {
e = new HpdTestbed();
e.send("load " + Config.getPkgDataFile("test-exe-x86").getPath()
+ "\n");
- e.expect("Loaded executable file.*");
+ e.expect("\\[0\\.0\\] Loaded executable file.*");
e.send("quit\n");
e.expect("Quitting\\.\\.\\.");
e.close();
@@ -67,10 +67,10 @@ public class TestLoadCommand extends TestLib {
public void testLoadStart() {
e = new HpdTestbed();
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(),
- "Loaded executable file.*");
+ "\\[0\\.0\\] Loaded executable file.*");
e.sendCommandExpectPrompt("focus", "Target set.*\\[0\\.0\\]\t\t0\t0.*");
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(),
- "Loaded executable file.*");
+ "\\[1\\.0] Loaded executable file.*");
e.sendCommandExpectPrompt("focus", "Target set.*\\[0\\.0\\]\t\t0\t0.*"+
"\\[1\\.0\\]\t\t0*\\t0.*");
e.sendCommandExpectPrompt("start", "Attached to process.*Attached to process.*");
@@ -83,9 +83,9 @@ public class TestLoadCommand extends TestLib {
public void testLoadRunRun() {
e = new HpdTestbed();
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(),
- "Loaded executable file.*");
+ "\\[0\\.0\\] Loaded executable file.*");
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(),
- "Loaded executable file.*");
+ "\\[1\\.0\\] Loaded executable file.*");
e.sendCommandExpectPrompt("start", "Attached to process.*Attached to process.*");
e.send("quit\n");
e.expect("Quitting\\.\\.\\.");
@@ -103,9 +103,9 @@ public class TestLoadCommand extends TestLib {
public void testLoadDisplay() {
e = new HpdTestbed();
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(),
- "Loaded executable file.*");
+ "\\[0\\.0\\] Loaded executable file.*");
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(),
- "Loaded executable file.*");
+ "\\[1\\.0\\] Loaded executable file.*");
e.sendCommandExpectPrompt("load", "Target set.*\\[0\\.0\\].*\\[1\\.0\\].*");
e.send("quit\n");
e.expect("Quitting\\.\\.\\.");
diff --git a/frysk-core/frysk/hpd/TestRunCommand.java b/frysk-core/frysk/hpd/TestRunCommand.java
index 90439ca..a8ab9c8 100644
--- a/frysk-core/frysk/hpd/TestRunCommand.java
+++ b/frysk-core/frysk/hpd/TestRunCommand.java
@@ -53,7 +53,7 @@ public class TestRunCommand extends TestLib {
public void testRunCommand() {
e = new HpdTestbed();
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(),
- "Loaded executable file.*");
+ "\\[0\\.0\\] Loaded executable file.*");
e.sendCommandExpectPrompt("run ",
"Attached to process ([0-9]+).*Running process ([0-9]+).*");
try { Thread.sleep(1000); } catch (Exception e) {}
@@ -73,7 +73,7 @@ public class TestRunCommand extends TestLib {
return;
e = new HpdTestbed();
e.send("load " + Config.getPkgLibFile("funit-threads-looper").getPath() + "\n");
- e.expect("Loaded executable file.*" + prompt);
+ e.expect("\\[0\\.0\\] Loaded executable file.*" + prompt);
e.send("run\n");
e.expect("Attached to process ([0-9]+).*");
e.expect("Running process ([0-9]+).*" + prompt);
@@ -91,7 +91,7 @@ public class TestRunCommand extends TestLib {
//try { Thread.sleep(1000); } catch (Exception e) {}
e.send("run\n");
e.expect(".*Killing process ([0-9])+.*");
- e.expect("Loaded executable file.*");
+ e.expect("\\[0\\.0\\] Loaded executable file.*");
e.expect("Attached to process ([0-9])+.*");
e.expect("Running process ([0-9])+.*");
//e.sendCommandExpectPrompt("run", "Killing process ([0-9])+.*" +
@@ -106,7 +106,7 @@ public class TestRunCommand extends TestLib {
e = new HpdTestbed();
String[] param = { "-testing", "parameter2", "-g"};
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-parameters").getPath(),
- "Loaded executable file.*");
+ "\\[0\\.0\\] Loaded executable file.*");
String parameters = "";
for (int i = 0; i < param.length; i++) {
parameters = parameters + param[i] + " ";
@@ -157,9 +157,9 @@ public class TestRunCommand extends TestLib {
return;
e = new HpdTestbed();
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(),
- "Loaded executable file.*");
+ "\\[0\\.0\\] Loaded executable file.*");
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(),
- "Loaded executable file.*");
+ "\\[1\\.0\\] Loaded executable file.*");
e.sendCommandExpectPrompt("focus", "Target set.*\\[0\\.0\\]\t\t0\t0.*"+
"\\[1\\.0\\]\t\t0*\\t0.*");
e.sendCommandExpectPrompt("run", "Attached to process ([0-9]+).*Attached to process ([0-9]+).*" +
@@ -169,7 +169,7 @@ public class TestRunCommand extends TestLib {
// "Running process ([0-9]+).*");
e.send("run\n");
e.expect("Killing process ([0-9]+).*");
- e.expect("Loaded executable file.*");
+ e.expect("\\[1\\.0\\] Loaded executable file.*");
e.expect("Attached to process ([0-9]+).*");
e.expect("Running process ([0-9]+).*");
e.sendCommandExpectPrompt("focus", "Target set.*\\[1\\.0\\]\t\t([0-9]+)\t([0-9]+).*" +
diff --git a/frysk-core/frysk/hpd/TestStartCommand.java b/frysk-core/frysk/hpd/TestStartCommand.java
index 9f66c46..c81650f 100644
--- a/frysk-core/frysk/hpd/TestStartCommand.java
+++ b/frysk-core/frysk/hpd/TestStartCommand.java
@@ -53,7 +53,7 @@ public class TestStartCommand extends TestLib {
public void testStartCommand() {
e = new HpdTestbed();
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(),
- "Loaded executable file.*");
+ "\\[0\\.0] Loaded executable file.*");
e.sendCommandExpectPrompt("start", "Attached to process.*");
e.sendCommandExpectPrompt("where", "[0.0].*");
e.send("quit\n");
@@ -71,7 +71,7 @@ public class TestStartCommand extends TestLib {
e = new HpdTestbed();
String[] param = { "teststart", "parameter2start", "-g"};
e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-parameters").getPath(),
- "Loaded executable file.*");
+ "\\[0\\.0\\] Loaded executable file.*");
String parameters = "";
for (int i = 0; i < param.length; i++) {
parameters = parameters + param[i] + " ";
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-14 20:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-14 20:58 [SCM] master: * LoadCommand.java: Add target set to output line rmoseley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).