diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-04 09:26:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-04 09:26:20 +0100 |
| commit | 93fe786f6824df71f5f912754f0bd8e7bf1424e7 (patch) | |
| tree | 96ed2d9710d9106a712e05aa9cf0dd0f376d010f /scripts/TestUtil.py | |
| parent | ICE-6043 - bumping timeout for IceDiscovery test (diff) | |
| download | ice-93fe786f6824df71f5f912754f0bd8e7bf1424e7.tar.bz2 ice-93fe786f6824df71f5f912754f0bd8e7bf1424e7.tar.xz ice-93fe786f6824df71f5f912754f0bd8e7bf1424e7.zip | |
Minor fix to Util.py
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index adcafed5096..1b13c325d80 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -793,6 +793,9 @@ def getIceExe(name): else: return os.path.join(getCppBinDir(), name) +def getNodeCmd(): + return nodeCmd + class InvalidSelectorString(Exception): def __init__(self, value): self.value = value @@ -1771,9 +1774,9 @@ def getTestEnv(lang, testdir): # C++ extensions (py, ruby, php) # if isWin32(): - addLdPath(getCppLibDir(), env) + addLdPath(getCppLibDir(lang), env) elif lang in ["py", "rb", "php"]: - addLdPath(getCppLibDir(), env) + addLdPath(getCppLibDir(lang), env) if lang == "javae": javaDir = os.path.join(getIceDir("javae", testdir), "jdk", "lib") |