summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/gc/run.py
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2007-11-07 14:59:34 -0330
committerBrent Eagles <brent@zeroc.com>2007-11-07 14:59:34 -0330
commit676286717393ad5a1dfecac80022ce85cd503711 (patch)
treefbf5f846218fcac6de115bea01fe1572d309d0c2 /cpp/test/Ice/gc/run.py
parent- Fixing bug 2522 for Python. This involved adding the C++ class (diff)
downloadice-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/Ice/gc/run.py')
-rwxr-xr-xcpp/test/Ice/gc/run.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/gc/run.py b/cpp/test/Ice/gc/run.py
index 0430fd0fe33..70442cc70a0 100755
--- a/cpp/test/Ice/gc/run.py
+++ b/cpp/test/Ice/gc/run.py
@@ -21,13 +21,13 @@ sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
name = os.path.join("Ice", "gc")
-testdir = os.path.join(toplevel, "test", name)
+testdir = os.path.dirname(os.path.abspath(__file__))
client = os.path.join(testdir, "client")
print "starting client...",
seedfile = testdir + "/seed"
-clientPipe = os.popen(client + TestUtil.clientOptions + " " + seedfile + " 2>&1")
+clientPipe = os.popen(TestUtil.getCommandLine(client, TestUtil.DriverConfig("client"), TestUtil.getTestEnv()) + " " + seedfile + " 2>&1")
print "ok"
TestUtil.printOutputFromPipe(clientPipe)