5 files changed, 24 insertions, 8 deletions
diff --git a/cpp/demo/Freeze/backup/db/DB_CONFIG b/cpp/demo/Freeze/backup/db/DB_CONFIG
index 7e738e09d58..7e738e09d58 100644..100755
--- a/cpp/demo/Freeze/backup/db/DB_CONFIG
+++ b/cpp/demo/Freeze/backup/db/DB_CONFIG
diff --git a/cpp/demo/Freeze/backup/db/data/.gitignore b/cpp/demo/Freeze/backup/db/data/.gitignore
index 39af5887579..39af5887579 100644..100755
--- a/cpp/demo/Freeze/backup/db/data/.gitignore
+++ b/cpp/demo/Freeze/backup/db/data/.gitignore
diff --git a/cpp/demo/IceGrid/icebox/expect.py b/cpp/demo/IceGrid/icebox/expect.py
index 525d1ceb0e3..c10608ee3a1 100755
--- a/cpp/demo/IceGrid/icebox/expect.py
+++ b/cpp/demo/IceGrid/icebox/expect.py
@@ -26,7 +26,19 @@ import demoscript.Util
 demoscript.Util.defaultLanguage = "C++"
 import demoscript.IceGrid.icebox
 
+desc = 'application.xml'
+if demoscript.Util.mode == 'debug':
+    fi = open(desc, "r")
+    desc = 'tmp_application.xml'
+    fo = open(desc, "w")
+    for l in fi:
+        if l.find('exe="icebox"') != -1:
+            l = l.replace('exe="icebox"', 'exe="iceboxd.exe"')
+        fo.write(l)
+    fi.close()
+    fo.close()
+
 directory = os.path.dirname(os.path.abspath(__file__))
 demoscript.Util.addLdPath(directory)
 
-demoscript.IceGrid.icebox.run('./client')
+demoscript.IceGrid.icebox.run('./client', desc[0:len(desc)-4])
diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py
index aa8c85bba0e..0a92a007ae0 100755
--- a/cpp/demo/IceStorm/replicated/expect.py
+++ b/cpp/demo/IceStorm/replicated/expect.py
@@ -32,7 +32,7 @@ if demoscript.Util.mode == 'debug':
     desc = 'tmp_application.xml'
     fo = open(desc, "w")
     for l in fi:
-        if l.find('exe="icebox"'):
+        if l.find('exe="icebox"') != -1:
             l = l.replace('exe="icebox"', 'exe="iceboxd.exe"')
         fo.write(l)
     fi.close()
@@ -97,9 +97,11 @@ sub.waitTestSuccess()
 pub.kill(signal.SIGINT)
 pub.waitTestSuccess()
 
-matchpat(node, [ 'DemoIceStorm-1: Topic: time: remove replica observer: [-0-9A-Fa-f]+',
-                 'DemoIceStorm-2: Topic: time: remove replica observer: [-0-9A-Fa-f]+' ,
-                 'DemoIceStorm-3: Topic: time: unsubscribe: [-0-9A-Fa-f]+' ]) 
+# With Cygwin SIGINT isn't intercepted.
+if not demoscript.Util.isCygwin():
+    matchpat(node, [ 'DemoIceStorm-1: Topic: time: remove replica observer: [-0-9A-Fa-f]+',
+		     'DemoIceStorm-2: Topic: time: remove replica observer: [-0-9A-Fa-f]+' ,
+		     'DemoIceStorm-3: Topic: time: unsubscribe: [-0-9A-Fa-f]+' ]) 
 
 admin.sendline('registry shutdown Master')
 admin.sendline('exit')
diff --git a/cpp/demo/IceStorm/replicated2/expect.py b/cpp/demo/IceStorm/replicated2/expect.py
index d020ebc52a4..c933f5303d6 100755
--- a/cpp/demo/IceStorm/replicated2/expect.py
+++ b/cpp/demo/IceStorm/replicated2/expect.py
@@ -73,9 +73,11 @@ sub.waitTestSuccess()
 pub.kill(signal.SIGINT)
 pub.waitTestSuccess()
 
-ib1.expect('Topic: time: remove replica observer: [-0-9A-Fa-f]+')
-ib2.expect('Topic: time: remove replica observer: [-0-9A-Fa-f]+')
-ib3.expect('Topic: time: unsubscribe: [-0-9A-Fa-f]+')
+# With Cygwin SIGINT isn't intercepted.
+if not demoscript.Util.isCygwin():
+    ib1.expect('Topic: time: remove replica observer: [-0-9A-Fa-f]+')
+    ib2.expect('Topic: time: remove replica observer: [-0-9A-Fa-f]+')
+    ib3.expect('Topic: time: unsubscribe: [-0-9A-Fa-f]+')
 
 admin = demoscript.Util.spawn('iceboxadmin --Ice.Config=config.ib1 shutdown')
 admin.waitTestSuccess()