diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /cpp/test/IceGrid/distribution/run.py | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
Diffstat (limited to 'cpp/test/IceGrid/distribution/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/distribution/run.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cpp/test/IceGrid/distribution/run.py b/cpp/test/IceGrid/distribution/run.py index 5bd5a77abd1..53b01e90a9c 100755 --- a/cpp/test/IceGrid/distribution/run.py +++ b/cpp/test/IceGrid/distribution/run.py @@ -21,11 +21,7 @@ sys.path.append(os.path.join(path[0], "scripts")) import TestUtil, IceGridAdmin def icepatch2Calc(datadir, dirname): - icePatch2Calc = "" - if TestUtil.isBCC2010(): - icePatch2Calc = os.path.join(TestUtil.getServiceDir(), "icepatch2calc") - else: - icePatch2Calc = os.path.join(TestUtil.getCppBinDir(), "icepatch2calc") + icePatch2Calc = os.path.join(TestUtil.getCppBinDir(), "icepatch2calc") commandProc = TestUtil.spawn('"%s" "%s"' % (icePatch2Calc, os.path.join(datadir, dirname))) commandProc.waitTestSuccess() |