diff options
| author | Jose <jose@zeroc.com> | 2014-11-20 23:12:11 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-20 23:12:11 +0100 |
| commit | 0da5f57fabef54f364e1db8ac52e24a80d55e440 (patch) | |
| tree | ddb7083054ac6e6acb69061c9fd2168d6d20d973 | |
| parent | ICE-5927 - Amend previous timeout fix to make them look cleaner (diff) | |
| download | ice-0da5f57fabef54f364e1db8ac52e24a80d55e440.tar.bz2 ice-0da5f57fabef54f364e1db8ac52e24a80d55e440.tar.xz ice-0da5f57fabef54f364e1db8ac52e24a80d55e440.zip | |
Fixed (ICE-5950) - test\Slice\errorDetection failure with VC120 x64
| -rwxr-xr-x | cpp/test/Slice/errorDetection/run.py | 2 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py index 3ab0064935b..4f5e1d40d55 100755 --- a/cpp/test/Slice/errorDetection/run.py +++ b/cpp/test/Slice/errorDetection/run.py @@ -20,7 +20,7 @@ if len(path) == 0: sys.path.append(os.path.join(path[0], "scripts")) import TestUtil -slice2cpp = '"%s"' % os.path.join(TestUtil.getCppBinDir(), "slice2cpp") +slice2cpp = '"%s"' % TestUtil.getSliceTranslator() regex1 = re.compile("\.ice$", re.IGNORECASE) files = [] diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index e6a0ad828f9..a1ac873cf85 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1646,6 +1646,9 @@ def getCppBinDir(lang = None): binDir = os.path.join(binDir, "c++11") return binDir +def getSliceTranslator(lang = "cpp"): + return os.path.join(os.path.join(iceHome if iceHome else getIceDir("cpp"), "bin") , "slice2%s" % lang) + def getCppLibDir(lang = None): if isWin32(): return getCppBinDir(lang) |