[SCM] master: Fix some expect manual timeout cases.

pmuldoon@sourceware.org pmuldoon@sourceware.org
Mon Dec 17 18:22:00 GMT 2007


The branch, master has been updated
       via  aaef9996c9d45d73d88b04ddd1334b53970d7e7a (commit)
      from  b1956ae0e033bbecd1d58cdf732e806968e82e81 (commit)

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

- Log -----------------------------------------------------------------
commit aaef9996c9d45d73d88b04ddd1334b53970d7e7a
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Mon Dec 17 18:22:27 2007 +0000

    Fix some expect manual timeout cases.
    
    2007-12-17  Phil Muldoon  <pmuldoon@redhat.com>
    
            * TestAuxvCommand.java (testAuxVCoreCommand): Remove expect
            timeout override.
            * TestCoreCommand.java: Ditto.

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

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog            |    8 +++++++-
 frysk-core/frysk/hpd/TestAuxvCommand.java |    2 +-
 frysk-core/frysk/hpd/TestCoreCommand.java |   12 ++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index c8afbd5..082baca 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,4 +1,10 @@
-2007-12-14  cagney  <cagney@redhat.com>
+2007-12-17  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* TestAuxvCommand.java (testAuxVCoreCommand): Remove expect
+	timeout override.
+	* TestCoreCommand.java: Ditto.
+
+2007-12-14  Andrew Cagney  <cagney@redhat.com>
 
 	* HpdTestbed.java: Update; EofException renamed to EndOfFileException.
 	* TestPreprocessor.java: Ditto.
diff --git a/frysk-core/frysk/hpd/TestAuxvCommand.java b/frysk-core/frysk/hpd/TestAuxvCommand.java
index a0f9c59..3b566b7 100644
--- a/frysk-core/frysk/hpd/TestAuxvCommand.java
+++ b/frysk-core/frysk/hpd/TestAuxvCommand.java
@@ -74,7 +74,7 @@ public class TestAuxvCommand extends TestLib {
     e = new HpdTestbed();
     e.send("core " + core.getPath()
 	   + " -noexe\n");
-    e.expect(5, "Attached to core file.*");
+    e.expect("Attached to core file.*");
     e.send("auxv\n");
     Iterator i = buildAuxv.auxvData.iterator();
     while (i.hasNext())
diff --git a/frysk-core/frysk/hpd/TestCoreCommand.java b/frysk-core/frysk/hpd/TestCoreCommand.java
index 834ce6c..e193acd 100644
--- a/frysk-core/frysk/hpd/TestCoreCommand.java
+++ b/frysk-core/frysk/hpd/TestCoreCommand.java
@@ -52,7 +52,7 @@ public class TestCoreCommand extends TestLib {
 	e = new HpdTestbed();
 	e.send("core " + Config.getPkgDataFile("test-core-x86").getPath()
 		+ " -noexe\n");
-	e.expect(5, "Attached to core file.*");
+	e.expect("Attached to core file.*");
 	e.close();
     }
     
@@ -60,7 +60,7 @@ public class TestCoreCommand extends TestLib {
 	e = new HpdTestbed();
 	e.send("core " + Config.getPkgDataFile("test-core-x86").getPath()
 		+ "\n");
-	e.expect(5, "Error:*");
+	e.expect("Error:*");
 	e.close();
     }
     
@@ -68,7 +68,7 @@ public class TestCoreCommand extends TestLib {
 	e = new HpdTestbed();
 	e.send("core " + Config.getPkgDataFile("test-core-x86").getPath()
 		+ "foo\n");
-	e.expect(5, "Error:*");
+	e.expect("Error:*");
 	e.close();
     }
 
@@ -80,7 +80,7 @@ public class TestCoreCommand extends TestLib {
 	e = new HpdTestbed();
 	e.send("core " + core.getPath() + " "
 	       + SlaveOffspring.getExecutable().getPath() + "\n");
-	e.expect(5, "Attached to core file.*");
+	e.expect("Attached to core file.*");
 	e.close();
 	core.delete();
     }
@@ -93,9 +93,9 @@ public class TestCoreCommand extends TestLib {
 	e = new HpdTestbed();
 	e.send("core " + core.getPath() + " "
 	       + SlaveOffspring.getExecutable().getPath() + "\n");
-	e.expect(5, "Attached to core file.*");
+	e.expect("Attached to core file.*");
 	e.send("run\n");
-	e.expect(5, "Attached to process*");
+	e.expect("Attached to process*");
 	e.close();
 	core.delete();
     }


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



More information about the Frysk-cvs mailing list