diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-28 16:35:32 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-28 16:35:32 +0100 |
| commit | ce3ba5f554bb622c35e3f5e2416da24f145f9a0a (patch) | |
| tree | e42f403bc40617aa29aa2e43f84f60dfc4264128 | |
| parent | ICE-5023 overwire .Addin files (diff) | |
| download | ice-ce3ba5f554bb622c35e3f5e2416da24f145f9a0a.tar.bz2 ice-ce3ba5f554bb622c35e3f5e2416da24f145f9a0a.tar.xz ice-ce3ba5f554bb622c35e3f5e2416da24f145f9a0a.zip | |
Better fix for running VS2012 tests against installation
| -rw-r--r-- | scripts/IceGridAdmin.py | 13 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index 27b504d484f..2d11c3c5356 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -70,11 +70,7 @@ def getDefaultLocatorProperty(): def startIceGridRegistry(testdir, dynamicRegistration = False): - iceGrid = "" - if TestUtil.isVC90(): - iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") - else: - iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") + iceGrid = TestUtil.getIceGridRegistry() command = ' --nowarn ' + registryOptions if dynamicRegistration: @@ -155,12 +151,7 @@ def iceGridNodePropertiesOverride(): def startIceGridNode(testdir): - iceGrid = "" - if TestUtil.isVC90(): - iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridnode") - else: - iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridnode") - + iceGrid = TestUtil.getIceGridNode() dataDir = os.path.join(testdir, "db", "node") if not os.path.exists(dataDir): os.mkdir(dataDir) diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 8fceaaff952..03555dfa4da 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1381,6 +1381,8 @@ def createConfig(path, lines, enc=None): def getCppBinDir(lang = None): binDir = os.path.join(getIceDir("cpp"), "bin") if iceHome: + if lang == None: + lang = getDefaultMapping() if lang == "cpp" and isVS2012(): binDir = os.path.join(binDir, "vc110") if x64: |