[SCM] master: Merge branch 'master' of ssh://sources.redhat.com/git/frysk

[scox@sourceware.org]

The branch, master has been updated
       via  c0c08f0972f8bf58b60bad249421032b17e55f63 (commit)
       via  f76200f31dc070adaff33426daa90b239dd53865 (commit)
      from  afccca1009fdea92c30ebc3a34227045daa6d929 (commit)

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

- Log -----------------------------------------------------------------
commit c0c08f0972f8bf58b60bad249421032b17e55f63
Merge: f76200f31dc070adaff33426daa90b239dd53865 afccca1009fdea92c30ebc3a34227045daa6d929
Author: Stan Cox <scox@redhat.com>
Date:   Fri Nov 16 10:57:20 2007 -0500

    Merge branch 'master' of ssh://sources.redhat.com/git/frysk

commit f76200f31dc070adaff33426daa90b239dd53865
Author: Stan Cox <scox@redhat.com>
Date:   Fri Nov 16 10:56:57 2007 -0500

    Use sendCommandExpectPrompt where applicable.
    
    * TestListCommand.java (testListPC): Use sendCommandExpectPrompt.
    (testListFunction): Likewise.
    (testListReverse): Likewise.
    (testListErrors): Likewise.

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

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog            |    7 +++++++
 frysk-core/frysk/hpd/TestListCommand.java |   22 ++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 0f67675..b5690a0 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-16  Stan Cox  <scox@redhat.com>
+
+	* TestListCommand.java (testListPC): Use sendCommandExpectPrompt.
+	(testListFunction): Likewise.
+	(testListReverse): Likewise.
+	(testListErrors): Likewise.
+
 2007-11-15  Stan Cox  <scox@redhat.com>
 	* TestListCommand.java (testListPC): Change to use funit-quicksort.
 	(testListFunction): Likewise.
diff --git a/frysk-core/frysk/hpd/TestListCommand.java b/frysk-core/frysk/hpd/TestListCommand.java
index ae3fb49..8b2a015 100644
--- a/frysk-core/frysk/hpd/TestListCommand.java
+++ b/frysk-core/frysk/hpd/TestListCommand.java
@@ -52,8 +52,7 @@ public class TestListCommand extends TestLib {
 
     public void testListPC() {
 	e = HpdTestbed.run("funit-quicksort");
-        e.send("break main\n");
-        e.expect("breakpoint.*" + prompt);
+	e.sendCommandExpectPrompt("break main", "breakpoint.*");
         e.send("go\n");
         e.expect("go.*\n" + prompt + "Breakpoint");
 	// Matching the list expected output is a trial and error process
@@ -80,8 +79,7 @@ public class TestListCommand extends TestLib {
 
     public void testListFunction() {
 	e = HpdTestbed.run("funit-quicksort");
-        e.send("break main\n");
-        e.expect("breakpoint.*" + prompt);
+	e.sendCommandExpectPrompt("break main", "breakpoint.*");
         e.send("go\n");
         e.expect("go.*\n" + prompt + "Breakpoint");
 	e.send("list\n");
@@ -125,8 +123,7 @@ public class TestListCommand extends TestLib {
 
     public void testListReverse() {
 	e = HpdTestbed.run("funit-quicksort");
-        e.send("break main\n");
-        e.expect("breakpoint.*" + prompt);
+	e.sendCommandExpectPrompt("break main", "breakpoint.*");
         e.send("go\n");
         e.expect("go.*\n" + prompt + "Breakpoint");
 	e.send("list\n");
@@ -160,16 +157,13 @@ public class TestListCommand extends TestLib {
 
     public void testListErrors() {
 	e = HpdTestbed.run("funit-quicksort");
-        e.send("break main\n");
-        e.expect("breakpoint.*" + prompt);
+	e.sendCommandExpectPrompt("break main", "breakpoint.*");
         e.send("go\n");
         e.expect("go.*\n" + prompt + "Breakpoint");
-	e.send("list x\n");
-	e.expect(".*function x not found.*" + prompt);
-	e.send("list xyz\n");
-	e.expect(".*symbol xyz not found.*" + prompt);
-        e.send("quit\n");
-        e.expect("quit.*\nQuitting...");
+	e.sendCommandExpectPrompt("list x", ".*function x not found.*"); 
+	e.sendCommandExpectPrompt("list xyz", ".*symbol xyz not found.*");
+	e.send("quit\n");
+	e.expect("quit.*\nQuitting...");
         e.close();
     }
 }


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