summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-09-17 14:34:55 +0200
committerJose <jose@zeroc.com>2013-09-17 14:34:55 +0200
commit195339f02a38cf0b8efd56bc6501085769bfa8d0 (patch)
tree88dad6e6cb98e950a1cb8baa888ab23f5b3c185c /scripts/TestUtil.py
parentFixed ICE-5433 - fixed test/Ice/properties/run.py to work with non-UTF8 locales (diff)
downloadice-195339f02a38cf0b8efd56bc6501085769bfa8d0.tar.bz2
ice-195339f02a38cf0b8efd56bc6501085769bfa8d0.tar.xz
ice-195339f02a38cf0b8efd56bc6501085769bfa8d0.zip
Fix JAVA_HOME setting in test and demo scripts
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 044124e1732..bb94678e6c8 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -27,7 +27,7 @@ cpp11 = False # Binary distribution is c++ 11
# Default java loader
javaHome = os.environ.get("JAVA_HOME", "")
-javaCmd = os.path.join('"%s"' % javaHome, "bin", "java") if javaHome else "java"
+javaCmd = '"%s"' % os.path.join(javaHome, "bin", "java") if javaHome else "java"
valgrind = False # Set to True to use valgrind for C++ executables.
appverifier = False # Set to True to use appverifier for C++ executables, This is windows only feature