diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-11-29 18:52:03 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-11-29 18:52:03 +0100 |
| commit | f0482e27130b6d45f2a2cf506dfa4dcfd01c4472 (patch) | |
| tree | 935766d307a1554721e388213de211bec2f04315 /cpp | |
| parent | Build Slice/keyword test with the Objective-C arc-shared configuration (diff) | |
| download | ice-f0482e27130b6d45f2a2cf506dfa4dcfd01c4472.tar.bz2 ice-f0482e27130b6d45f2a2cf506dfa4dcfd01c4472.tar.xz ice-f0482e27130b6d45f2a2cf506dfa4dcfd01c4472.zip | |
Provide the process to getLibSubDir/getBinSubDir
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/IceGrid/noRestartUpdate/test.py | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/test.py | 4 | ||||
| -rw-r--r-- | cpp/test/IceGrid/update/test.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/IceGrid/noRestartUpdate/test.py b/cpp/test/IceGrid/noRestartUpdate/test.py index 220ca4ef8b3..2bcb8e1be6d 100644 --- a/cpp/test/IceGrid/noRestartUpdate/test.py +++ b/cpp/test/IceGrid/noRestartUpdate/test.py @@ -16,7 +16,7 @@ class IceGridNoRestartUpdateTestCase(IceGridTestCase): self.mkdirs("db/node2") clientProps = lambda process, current: { - "IceBinDir" : current.testcase.getMapping().getBinDir(current), + "IceBinDir" : current.testcase.getMapping().getBinDir(None, current), "ServerDir" : current.getBuildDir("server"), "ServiceDir" : current.getBuildDir("testservice") } diff --git a/cpp/test/IceGrid/session/test.py b/cpp/test/IceGrid/session/test.py index c720fcf79de..40dc66f84b5 100644 --- a/cpp/test/IceGrid/session/test.py +++ b/cpp/test/IceGrid/session/test.py @@ -38,13 +38,13 @@ registryProps = { } clientProps = lambda process, current: { - "IceBinDir" : current.testcase.getMapping().getBinDir(current), + "IceBinDir" : current.testcase.getMapping().getBinDir(None, current), "ServerDir" : current.getBuildDir("server"), "TestDir" : "{testdir}", } clientProps10 = lambda process, current: { - "IceBinDir" : current.testcase.getMapping().getBinDir(current), + "IceBinDir" : current.testcase.getMapping().getBinDir(None, current), "ServerDir" : current.getBuildDir("server"), "TestDir" : "{testdir}", "Ice.Default.EncodingVersion" : "1.0" diff --git a/cpp/test/IceGrid/update/test.py b/cpp/test/IceGrid/update/test.py index 3decb0431e9..77847b4d202 100644 --- a/cpp/test/IceGrid/update/test.py +++ b/cpp/test/IceGrid/update/test.py @@ -17,7 +17,7 @@ class IceGridUpdateTestCase(IceGridTestCase): clientProps = lambda process, current: { "NodePropertiesOverride" : current.testcase.icegridnode[0].getPropertiesOverride(current), - "IceBinDir" : current.testcase.getMapping().getBinDir(current), + "IceBinDir" : current.testcase.getMapping().getBinDir(None, current), "ServerDir" : current.getBuildDir("server"), "TestDir" : "{testdir}" } |