Squashed commit of the following:

commit d74cec9e6c77e70b33883f517b1bb6f97b2ffa5e
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:33:06 2007 +0800

    updates.

commit 643b31f979a00ea5397206ca59f20bb58c62660e
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:32:35 2007 +0800

    added some .gitignore rules.

commit 1510d38798976753b435f32308e79acd9fcd2722
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:05:10 2007 +0800

    removed bogus use of 127.0.0.1

commit 3c91e89b01af20a0dacfdbc1fbeca1c67c796656
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:01:43 2007 +0800

    Verify that cygwin python is used under Windows.

commit ff160725c051eedb28a42d9dd69f0d8aa297e522
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:55:03 2007 +0800

    bump timeout for the node to terminate. killing the node leaves the servers running under cygwin

commit ec3bddb58e861f906bf39aee1fa818c3e9a50000
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:48:55 2007 +0800

    added back accidently removed files.

commit f9ea2f552d7f576ebfa878669925f4184a89257b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:47:47 2007 +0800

    http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2427, http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2422

commit 8a309ca0036dba7ecbd577edb2d737fa41174a5a
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 10:06:53 2007 +0800

    added ruby support to the expect scripts.

commit 34597c1ee6d80d6754c9e925bd376125dd104a5f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 09:26:10 2007 +0800

    added pexpect to git repository.

commit 4bd2e1f2b52bcb9906b03ac216db686b8229b545
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 18:49:51 2007 +0800

    numerous UNIX expect script fixes.

commit 25ab4a812f45a6e908d5d2d7ab03e557d79afa9f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 16:47:08 2007 +0800

    generate configuration files for IceGrid icebox/iceboxd

commit 6bb57bf7ed21d7256963c228aaf0b20657367a47
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 15:16:55 2007 +0800

    added python & C# support to the expect scripts.

commit 08f1a59971ad3a52a4357069554dcc309b2d062b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Aug 22 14:23:53 2007 +0800

    java expect scripts complete.

commit 3918f4ff3beea3005001bc55c5502c0825d8b7ea
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Aug 22 13:30:31 2007 +0800

    first set of expect changes.

1 files changed, 8 insertions, 13 deletions

diff --git a/demoscript/IceStorm/clock.py b/demoscript/IceStorm/clock.py
index e941fad7647..72ad9d83516 100755
--- a/demoscript/IceStorm/clock.py
+++ b/demoscript/IceStorm/clock.py
@@ -8,7 +8,8 @@
 #
 # **********************************************************************
 
-import pexpect, sys, time, signal, demoscript
+import sys, time, signal, demoscript
+import demoscript.pexpect as pexpect
 
 def runtest(icestorm, subCmd, subargs, pubCmd, pubargs):
     print "testing pub%s/sub%s..." % (pubargs, subargs),
@@ -25,14 +26,10 @@ def runtest(icestorm, subCmd, subargs, pubCmd, pubargs):
     sub.expect('[0-9][0-9]/[0-9][0-9].*\r{1,2}\n[0-9][0-9]/[0-9][0-9]')
 
     pub.kill(signal.SIGINT)
-    pub.expect(pexpect.EOF)
-    status = pub.wait()
-    assert status == 0 or status == 130 or pub.signalstatus == signal.SIGINT
+    pub.waitTestSuccess()
 
     sub.kill(signal.SIGINT)
-    sub.expect(pexpect.EOF)
-    status = sub.wait()
-    assert status == 0 or status == 130 or sub.signalstatus == signal.SIGINT
+    sub.waitTestSuccess()
     try:
         icestorm.expect('Unsubscribe:')
     except pexpect.TIMEOUT:
@@ -50,7 +47,7 @@ def run(subCmd, pubCmd):
     else:
         args = ''
 
-    icestorm = demoscript.Util.spawn('%s --Ice.Config=config.icebox --Ice.PrintAdapterReady %s' % (demoscript.Util.getIceBox(), args))
+    icestorm = demoscript.Util.spawn('%s --Ice.Config=config.icebox --Ice.PrintAdapterReady %s' % (demoscript.Util.getIceBox(), args), language="C++")
     icestorm.expect('.* ready')
 
     runtest(icestorm, subCmd, "", pubCmd, "")
@@ -62,8 +59,6 @@ def run(subCmd, pubCmd):
     for s in pubargs:
         runtest(icestorm, subCmd, "", pubCmd, s)
 
-    admin = demoscript.Util.spawn('iceboxadmin --Ice.Config=config.icebox shutdown')
-    admin.expect(pexpect.EOF)
-    assert admin.wait() == 0
-    icestorm.expect(pexpect.EOF)
-    assert icestorm.wait() == 0
+    admin = demoscript.Util.spawn('iceboxadmin --Ice.Config=config.icebox shutdown', language="C++")
+    admin.waitTestSuccess()
+    icestorm.waitTestSuccess()