summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-11-18 12:07:32 +0100
committerJose <jose@zeroc.com>2014-11-18 12:07:32 +0100
commitca667658fcaa614fd077d051313193017ca8f767 (patch)
tree548f4bcc7c60d1d98f17590f4404070b7a36fa61 /scripts/TestUtil.py
parenttesticedist typo (diff)
downloadice-ca667658fcaa614fd077d051313193017ca8f767.tar.bz2
ice-ca667658fcaa614fd077d051313193017ca8f767.tar.xz
ice-ca667658fcaa614fd077d051313193017ca8f767.zip
test script fix to run JS tests with bin dist
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 31267173200..0efb2e00a95 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1636,13 +1636,17 @@ def getTestEnv(lang, testdir):
jarSuffix = "-" + getIceVersion() + ".jar"
#
- # If Ice is installed from RPMs, just set the CLASSPATH for Java.
+ # If Ice is installed from RPMs:
+ # Set the CLASSPATH for Java.
+ # Set NODE_PATH for js
#
if iceHome == "/usr":
if lang == "java":
javaDir = os.path.join("/", "usr", "share", "java")
for jar in iceJARs:
addClasspath(os.path.join(javaDir, jar + jarSuffix), env)
+ if lang == "js":
+ addPathToEnv("NODE_PATH", os.path.join(testdir), env)
return env # That's it, we're done!
if isWin32():