From 78c3d328497b6d42862ce08191fa08f796fa423b Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Tue, 9 Dec 2014 10:28:48 +0100 Subject: Fix for ICE-6079: make sure IceGrid uses the java command from JAVA_HOME --- scripts/IceGridAdmin.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'scripts/IceGridAdmin.py') diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index ae303fb1ac2..8e5b6e1f555 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -241,12 +241,18 @@ def iceGridTest(application, additionalOptions = "", applicationOptions = ""): registryProcs = startIceGridRegistry(testdir) iceGridNodeProc = startIceGridNode(testdir) - + + javaHome = os.environ.get("JAVA_HOME", None) + javaExe = os.path.join(javaHome, "bin", "java") if javaHome else "java" + if application != "": sys.stdout.write("adding application... ") sys.stdout.flush() - iceGridAdmin("application add -n '" + os.path.join(testdir, application) + "' " + \ - "test.dir='" + testdir + "' ice.bindir='" + TestUtil.getCppBinDir() + "' " + applicationOptions) + iceGridAdmin("application add -n '" + os.path.join(testdir, application) + "' " + + "test.dir='" + testdir + "' " + + "ice.bindir='" + TestUtil.getCppBinDir() + "' " + + "java.exe='" + javaExe + "' " + + applicationOptions) print("ok") sys.stdout.write("starting client... ") @@ -288,7 +294,7 @@ def iceGridClientServerTest(additionalClientOptions, additionalServerOptions): clientOptions = getDefaultLocatorProperty() + ' ' + additionalClientOptions serverOptions = getDefaultLocatorProperty() + ' ' + additionalServerOptions - + registryProcs = startIceGridRegistry(testdir, True) sys.stdout.write("starting server... ") -- cgit v1.2.3