[SCM] master: Always pass milliseconds on timeout.

[mark@sourceware.org]

The branch, master has been updated
       via  8385f074781658054b44640914b94edeaf1e2c93 (commit)
      from  bc777c205aa8c0165ba7930630c146e5975b0fc0 (commit)

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

- Log -----------------------------------------------------------------
commit 8385f074781658054b44640914b94edeaf1e2c93
Author: Mark Wielaard <mwielaard@redhat.com>
Date:   Mon Feb 11 16:15:16 2008 +0100

    Always pass milliseconds on timeout.
    
    frysk-sys/frysk/expunit/ChangeLog
    2008-02-08  Mark Wielaard  <mark@klomp.org>
    
           * Child.java (expectMilliseconds): Pass miliseconds to
           TimeoutException.

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

Summary of changes:
 frysk-sys/frysk/expunit/ChangeLog  |    5 +++++
 frysk-sys/frysk/expunit/Child.java |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

First 500 lines of diff:
diff --git a/frysk-sys/frysk/expunit/ChangeLog b/frysk-sys/frysk/expunit/ChangeLog
index b2201c5..cc9aa41 100644
--- a/frysk-sys/frysk/expunit/ChangeLog
+++ b/frysk-sys/frysk/expunit/ChangeLog
@@ -1,5 +1,10 @@
 2008-02-08  Mark Wielaard  <mark@klomp.org>
 
+	* Child.java (expectMilliseconds): Pass miliseconds to
+	TimeoutException.
+
+2008-02-08  Mark Wielaard  <mark@klomp.org>
+
 	* TimeoutException.java: Properly format message and add unit.
 	
 2008-02-08  Andrew Cagney  <cagney@redhat.com>
diff --git a/frysk-sys/frysk/expunit/Child.java b/frysk-sys/frysk/expunit/Child.java
index 9aa43f6..3f051de 100644
--- a/frysk-sys/frysk/expunit/Child.java
+++ b/frysk-sys/frysk/expunit/Child.java
@@ -162,7 +162,7 @@ class Child {
 	    long timeRemaining = endTime - System.currentTimeMillis();
 	    if (timeRemaining <= 0) {
 		fine.log(this, "match TIMEOUT");
-		throw new TimeoutException(timeoutMilliseconds / 1000, matches,
+		throw new TimeoutException(timeoutMilliseconds, matches,
 			output);
 	    }
 


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