[SCM] master: TestLoadCommand - Fix regex symbols.

[SCM] master: TestLoadCommand - Fix regex symbols.

[rmoseley]

The branch, master has been updated
       via  136df9efaf15a78aaa2ccb91cec7480017574611 (commit)
      from  4c7086268ca8b5e712032270403e990d949b161d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 136df9efaf15a78aaa2ccb91cec7480017574611
Author: Rick Moseley <rmoseley@localhost.localdomain>
Date:   Tue Dec 18 10:40:32 2007 -0600

    TestLoadCommand - Fix regex symbols.
    
    * TestLoadCommand.java - Fix regex symbols.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog            |    4 ++++
 frysk-core/frysk/hpd/TestLoadCommand.java |   15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 877c1fc..789cd32 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-18  Rick Moseley  <rmoseley@redhat.com>
+
+	* TestLoadCommand.java: Fix regex symbols.
+
 2007-12-17  Rick Moseley  <rmoseley@redhat.com>
 
 	* StartCommand.java: New.
diff --git a/frysk-core/frysk/hpd/TestLoadCommand.java b/frysk-core/frysk/hpd/TestLoadCommand.java
index fa061a6..fdb12e9 100644
--- a/frysk-core/frysk/hpd/TestLoadCommand.java
+++ b/frysk-core/frysk/hpd/TestLoadCommand.java
@@ -60,6 +60,8 @@ public class TestLoadCommand extends TestLib {
 	e.send("load " + Config.getPkgDataFile("test-exe-x86").getPath()
 		+ "foo\n");
 	e.expect(5, "File does not exist or is not readable*");
+	e.send("quit\n");
+	e.expect("Quitting...");
 	e.close();
     }
     
@@ -67,13 +69,16 @@ public class TestLoadCommand extends TestLib {
 	e = new HpdTestbed();
 	e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(),
 		"Loaded executable file.*");
-	e.sendCommandExpectPrompt("focus", "Target set.*[0.0]*0*0*");
+	//e.sendCommandExpectPrompt("focus", "Target set*pid*id*\r\n\\[0\\.0\\]*0*0.*");
+	e.sendCommandExpectPrompt("focus", "Target set.*\\[0\\.0\\]\t\t0\t0.*");
 	e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(),
 		"Loaded executable file.*");
-	e.sendCommandExpectPrompt("focus", "Target set.*[0.0]*0*0.*[1.0]*0*0.*");
+	e.sendCommandExpectPrompt("focus", "Target set.*\\[0\\.0\\]\t\t0\t0.*"+
+		"\\[1\\.0\\]\t\t0*\\t0.*");
 	e.sendCommandExpectPrompt("run", "Attached to process.*Attached to process.*");
-	e.sendCommandExpectPrompt("focus", "Target set.*[0.0].*[1.0].*");
-	//e.sendCommandExpectPrompt("quit", "Quitting.*");
+	e.sendCommandExpectPrompt("focus", "Target set.*\\[0\\.0\\].*\\[1\\.0].*");
+	e.send("quit\n");
+	e.expect("Quitting...");
 	e.close();
     }
     
@@ -84,6 +89,8 @@ public class TestLoadCommand extends TestLib {
 	e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(),
 		"Loaded executable file.*");
 	e.sendCommandExpectPrompt("run", "Attached to process.*Attached to process.*");
+	e.send("quit\n");
+	e.expect("Quitting...");
 	e.close();
     }
 }


hooks/post-receive
--
frysk system monitor/debugger