summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-01-14 09:22:33 +0100
committerJose <jose@zeroc.com>2015-01-14 09:22:33 +0100
commit195454df0895051579cd83d6e64d2308a8f42c16 (patch)
tree6527548e026a929f410aef51ad467b26c4e8bf2c /scripts/TestUtil.py
parentFix another bug with hello demos. (diff)
downloadice-195454df0895051579cd83d6e64d2308a8f42c16.tar.bz2
ice-195454df0895051579cd83d6e64d2308a8f42c16.tar.xz
ice-195454df0895051579cd83d6e64d2308a8f42c16.zip
JavaScript updates to use gulp and add npm and bower packages
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 7c35ba21739..b32b0383cb7 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1850,7 +1850,8 @@ def getTestEnv(lang, testdir):
addPathToEnv("RUBYLIB", os.path.join(getIceDir("rb", testdir), "ruby"), env)
if lang == "js":
- addPathToEnv("NODE_PATH", os.path.join(getIceDir("js", testdir), "node_modules" if iceHome else "src"), env)
+ if os.environ.get("USE_BIN_DIST", "no") != "yes":
+ addPathToEnv("NODE_PATH", os.path.join(getIceDir("js", testdir), "src"), env)
addPathToEnv("NODE_PATH", os.path.join(testdir), env)
return env;