stefanvodita commented on code in PR #13108:
URL: https://github.com/apache/lucene/pull/13108#discussion_r1502581745
##########
dev-tools/scripts/smokeTestRelease.py:
##########
@@ -911,33 +917,45 @@ def crawl(downloadedFiles, urlString, targetDir,
exclusions=set()):
sys.stdout.write('.')
-def make_java_config(parser, java17_home):
- def _make_runner(java_home, version):
- print('Java %s JAVA_HOME=%s' % (version, java_home))
+def make_java_config(parser, alt_java_homes):
+ def _make_runner(java_home, is_base_version=False):
if cygwin:
java_home = subprocess.check_output('cygpath -u "%s"' % java_home,
shell=True).decode('utf-8').strip()
cmd_prefix = 'export JAVA_HOME="%s" PATH="%s/bin:$PATH"
JAVACMD="%s/bin/java"' % \
(java_home, java_home, java_home)
s = subprocess.check_output('%s; java -version' % cmd_prefix,
shell=True,
stderr=subprocess.STDOUT).decode('utf-8')
- if s.find(' version "%s' % version) == -1:
- parser.error('got wrong version for java %s:\n%s' % (version, s))
+
+ actual_version = re.search(r'version "([1-9][0-9]*)', s).group(1)
+ print('Java %s JAVA_HOME=%s' % (actual_version, java_home))
+
+ if (is_base_version and BASE_JAVA_VERSION != actual_version) \
+ or int(BASE_JAVA_VERSION) > int(actual_version):
Review Comment:
Sure, I'll do separate messages for the two cases.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
