From b4728370c428331e0ef1b84eb4bc1a6b2c763a0c Mon Sep 17 00:00:00 2001 From: Michael McCandless Date: Mon, 5 Nov 2012 21:13:08 +0000 Subject: [PATCH] also set JAVACMD env var (sometimes ant uses only that and doesn't fallback to JAVA_HOME) git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1405956 13f79535-47bb-0310-9956-ffa450edef68 --- dev-tools/scripts/smokeTestRelease.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py index f012c398ee8..92c65bfe7ca 100644 --- a/dev-tools/scripts/smokeTestRelease.py +++ b/dev-tools/scripts/smokeTestRelease.py @@ -64,7 +64,7 @@ def javaExe(version): raise RuntimeError("unknown Java version '%s'" % version) if cygwin: path = os.popen('cygpath -u "%s"' % path).read().strip() - return 'export JAVA_HOME="%s" PATH="%s/bin:$PATH"' % (path, path) + return 'export JAVA_HOME="%s" PATH="%s/bin:$PATH" JAVACMD="%s/bin/java"' % (path, path, path) def verifyJavaVersion(version): s = os.popen('%s; java -version 2>&1' % javaExe(version)).read() @@ -77,11 +77,13 @@ try: JAVA6_HOME = env['JAVA6_HOME'] except KeyError: JAVA6_HOME = '/usr/local/jdk1.6.0_27' +print('JAVA6_HOME is %s' % JAVA6_HOME) try: JAVA7_HOME = env['JAVA7_HOME'] except KeyError: JAVA7_HOME = '/usr/local/jdk1.7.0_01' +print('JAVA7_HOME is %s' % JAVA7_HOME) verifyJavaVersion('1.6') verifyJavaVersion('1.7')