diff options
| author | Jose <jose@zeroc.com> | 2016-09-17 00:28:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-17 00:28:00 +0200 |
| commit | 47c3b5d2b03d3286cba2a3b4890e57fdd6135132 (patch) | |
| tree | 40e05ffec6df92a5b88fdb675d775580f41547c1 /scripts/TestUtil.py | |
| parent | 3.6.3 version fixes (diff) | |
| download | ice-47c3b5d2b03d3286cba2a3b4890e57fdd6135132.tar.bz2 ice-47c3b5d2b03d3286cba2a3b4890e57fdd6135132.tar.xz ice-47c3b5d2b03d3286cba2a3b4890e57fdd6135132.zip | |
Fix ICE-4787 - slice compilers and unicode paths
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 7ddb77922a9..eb65ceb858c 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1756,7 +1756,7 @@ def simpleTest(exe = None, options = "", interpreterOptions = ""): if appverifier: appVerifierAfterTestEnd([exe]) -def createConfig(path, lines, enc=None): +def createFile(path, lines, enc=None): if sys.version_info[0] > 2 and enc: config = open(path, "w", encoding=enc) else: @@ -1788,10 +1788,14 @@ def getCppBinDir(lang = None): return binDir def getSliceTranslator(lang = "cpp"): + compiler = "" if iceHome: - return os.path.join(iceHome, "bin", "slice2%s" % lang) + compiler = os.path.join(iceHome, "bin", "slice2%s" % lang) else: - return os.path.join(getCppBinDir(), ("slice2%s" % lang)) + compiler = os.path.join(getCppBinDir(), ("slice2%s" % lang)) + if isWin32(): + compiler += ".exe" + return compiler def getCppLibDir(lang = None): if isWin32(): |