diff options
| author | Brent Eagles <brent@zeroc.com> | 2007-11-07 14:59:34 -0330 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2007-11-07 14:59:34 -0330 |
| commit | 676286717393ad5a1dfecac80022ce85cd503711 (patch) | |
| tree | fbf5f846218fcac6de115bea01fe1572d309d0c2 /cpp/test/IceGrid/activation/run.py | |
| parent | - Fixing bug 2522 for Python. This involved adding the C++ class (diff) | |
| download | ice-676286717393ad5a1dfecac80022ce85cd503711.tar.bz2 ice-676286717393ad5a1dfecac80022ce85cd503711.tar.xz ice-676286717393ad5a1dfecac80022ce85cd503711.zip | |
- Moved cpp/slice to slice
- Merged all TestUtil.py modules to config/TestUtil.py
- Moved all certs to config/certs
- Updated test scripts to refer to new TestUtil.py module and use new
interfaces
- Updated build systems to refer to new slice location
- Moved cpp/install to distribution
- Moved and merged all IceGridAdmin.py modules to config.
- Modified build system to deal with new build logic. That is there are
3 basic ways to find the slice translators and runtime: ICE_HOME, an
RPM install and the source distribution. Automatically detecting Ice
in a default install location is now problematic and no longer done.
Diffstat (limited to 'cpp/test/IceGrid/activation/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/activation/run.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/test/IceGrid/activation/run.py b/cpp/test/IceGrid/activation/run.py index 0f15ca8b448..e461958094b 100755 --- a/cpp/test/IceGrid/activation/run.py +++ b/cpp/test/IceGrid/activation/run.py @@ -23,6 +23,8 @@ import IceGridAdmin name = os.path.join("IceGrid", "activation") -IceGridAdmin.iceGridTest(name, "application.xml", "", \ - ' \\"properties-override=' + TestUtil.clientServerOptions.replace("--", "") + '\\"') + +IceGridAdmin.iceGridTest(os.path.dirname(os.path.abspath(__file__)), name, "application.xml", "", \ + ' \\"properties-override=' + \ + TestUtil.getCommandLine("", TestUtil.DriverConfig("colloc")).replace("--", "") + '\\"') sys.exit(0) |