summaryrefslogtreecommitdiff
path: root/cpp/demo/IceGrid/icebox/expect.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 /cpp/demo/IceGrid/icebox/expect.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 'cpp/demo/IceGrid/icebox/expect.py')
-rwxr-xr-xcpp/demo/IceGrid/icebox/expect.py14
1 files changed, 13 insertions, 1 deletions
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])