http://bugzilla/bugzilla/show_bug.cgi?id=3127 - allDemos.py has many issues under Windows.

Squashed commit of the following:

commit 5c10903ba9e2ce49af02d5e543088a7edd149e6b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri May 9 22:45:21 2008 +0800

    Fix bug.

commit dd664b401df779cd7146d43bbe970e121cc4ceb5
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri May 9 22:27:39 2008 +0800

    fix bug with IceGrid/icebox expect script.

commit 21ba063ad8e1f07f26de3ab384aef47b59a4d34a
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Fri May 9 22:25:13 2008 +0800

    update -R/-r to take multiple filters.

commit 3ea23a392723c0edd0462e9ca4b5fbc36171ee05
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Fri May 9 22:05:36 2008 +0800

    First set of changes. At this point all demo scripts work under Windows.

1 files changed, 13 insertions, 9 deletions

diff --git a/demoscript/IceGrid/icebox.py b/demoscript/IceGrid/icebox.py
index f4306717798..e089837901c 100755
--- a/demoscript/IceGrid/icebox.py
+++ b/demoscript/IceGrid/icebox.py
@@ -56,9 +56,9 @@ def run(clientStr, desc = 'application'):
     sys.stdout.flush()
 
     for s in [ "Homer", "Marge", "Bart", "Lisa", "Maggie" ]:
-        client = demoscript.Util.spawn(clientStr)
-        node.expect("Hello from %s" % s)
-        client.waitTestSuccess(timeout=1)
+	client = demoscript.Util.spawn(clientStr)
+	node.expect("Hello from %s" % s)
+	client.waitTestSuccess(timeout=1)
 
     print "ok"
 
@@ -121,12 +121,16 @@ def run(clientStr, desc = 'application'):
     admin.expect('>>>')
     admin.sendline('exit')
 
-    admin = demoscript.Util.spawn('icegridadmin --Ice.Default.Router="DemoGlacier2/router:tcp -h localhost -p 4063"', language="C++")
-    admin.expect('user id:')
-    admin.sendline('foo')
-    admin.expect('password:')
-    admin.sendline('foo')
-    admin.expect('>>>')
+    # Cygwin seems to have problems with the password input.
+    if demoscript.Util.isCygwin():
+	admin = demoscript.Util.spawn('icegridadmin --Ice.Default.Router="DemoGlacier2/router:tcp -h localhost -p 4063" -u foo -p foo', language="C++")
+    else:
+	admin = demoscript.Util.spawn('icegridadmin --Ice.Default.Router="DemoGlacier2/router:tcp -h localhost -p 4063"', language="C++")
+	admin.expect('user id:')
+	admin.sendline('foo')
+	admin.expect('password:')
+	admin.sendline('foo')
+    admin.expect('>>>', timeout=100)
 
     admin.sendline("service start IceBox Homer")
     admin.expect('>>>')