summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 9012e29b0fc..c35f8a0428d 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1739,6 +1739,7 @@ def getTestEnv(lang, testdir):
print("warning: could not detect Ice Third party installation.")
else:
addClasspath(os.path.join("/" "usr" "share", "java", "lib", "db.jar"), env)
+
#
# If Ice is installed from RPMs:
# Set the CLASSPATH for Java.
@@ -1753,8 +1754,15 @@ def getTestEnv(lang, testdir):
addPathToEnv("NODE_PATH", os.path.join(testdir), env)
return env # That's it, we're done!
+ #
+ # For Win32 we always need to add bin dir to path
+ # for others we just need to add it for scripting
+ # languages that use C++ extensions (py, ruby, php)
+ #
if isWin32():
addLdPath(getCppLibDir(), env)
+ elif lang in ["py", "rb", "php"]:
+ addLdPath(getCppLibDir(), env)
if lang == "javae":
javaDir = os.path.join(getIceDir("javae", testdir), "jdk", "lib")