diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-08-04 19:18:45 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-08-04 19:18:45 -0230 |
| commit | d9c568300c2aed6ab736026ea116b3f1a72fbe43 (patch) | |
| tree | 27191ba2b0d1ef43256561da01462b98c7bd696d /cpp/demo/IceGrid/icebox/expect.py | |
| parent | Merge branch 'R3_3_branch' of ssh://cvs.zeroc.com/home/git/ice into R3_3_branch (diff) | |
| download | ice-d9c568300c2aed6ab736026ea116b3f1a72fbe43.tar.bz2 ice-d9c568300c2aed6ab736026ea116b3f1a72fbe43.tar.xz ice-d9c568300c2aed6ab736026ea116b3f1a72fbe43.zip | |
Numerous cleanups to the test suite and expect scripts.
Conflicts:
cpp/test/Glacier2/staticFiltering/run.py
Diffstat (limited to 'cpp/demo/IceGrid/icebox/expect.py')
| -rwxr-xr-x | cpp/demo/IceGrid/icebox/expect.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/demo/IceGrid/icebox/expect.py b/cpp/demo/IceGrid/icebox/expect.py index 9cfbc351353..e8d1cbbd055 100755 --- a/cpp/demo/IceGrid/icebox/expect.py +++ b/cpp/demo/IceGrid/icebox/expect.py @@ -23,7 +23,7 @@ from demoscript import * from demoscript.IceGrid import icebox desc = 'application.xml' -if Util.getBuild() == 'debug': +if Util.isDebugBuild(): fi = open(desc, "r") desc = 'tmp_application.xml' fo = open(desc, "w") @@ -34,7 +34,6 @@ if Util.getBuild() == 'debug': fi.close() fo.close() -directory = os.path.dirname(os.path.abspath(__file__)) -Util.addLdPath(directory) +Util.addLdPath(os.getcwd()) icebox.run('./client', desc[0:len(desc)-4]) |