summaryrefslogtreecommitdiff
path: root/demoscript/IceStorm/clock.py
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2008-05-09 22:46:45 +0800
committerMatthew Newhook <matthew@zeroc.com>2008-05-09 22:46:45 +0800
commit2328fb16c11a1cc0951afea846efe82a276302ce (patch)
tree9b6748e077274fc7a0684f80bcb5012582ac1b71 /demoscript/IceStorm/clock.py
parentMerge branch 'master' of cvs:/home/git/ice (diff)
downloadice-2328fb16c11a1cc0951afea846efe82a276302ce.tar.bz2
ice-2328fb16c11a1cc0951afea846efe82a276302ce.tar.xz
ice-2328fb16c11a1cc0951afea846efe82a276302ce.zip
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.
Diffstat (limited to 'demoscript/IceStorm/clock.py')
-rwxr-xr-xdemoscript/IceStorm/clock.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/demoscript/IceStorm/clock.py b/demoscript/IceStorm/clock.py
index 1a102aa880b..dfee20f3c9c 100755
--- a/demoscript/IceStorm/clock.py
+++ b/demoscript/IceStorm/clock.py
@@ -10,6 +10,7 @@
import sys, time, signal, demoscript
import demoscript.pexpect as pexpect
+import demoscript.Util as Util
def runtest(icestorm, subCmd, subargs, pubCmd, pubargs):
print "testing pub%s/sub%s..." % (pubargs, subargs),
@@ -30,10 +31,13 @@ def runtest(icestorm, subCmd, subargs, pubCmd, pubargs):
sub.kill(signal.SIGINT)
sub.waitTestSuccess()
- try:
- icestorm.expect('unsubscribe:')
- except pexpect.TIMEOUT:
- print "(Wait for Unsubscribe failed, expected for Mono)",
+
+ # With Cygwin SIGINT isn't intercepted.
+ if not Util.isCygwin():
+ try:
+ icestorm.expect('unsubscribe:')
+ except pexpect.TIMEOUT:
+ print "(Wait for Unsubscribe failed, expected for Mono)",
print "ok"
def run(subCmd, pubCmd):