Make Windows JAVA_HOME handling consistent with Linux#55261
Merged
rjernst merged 3 commits intoelastic:masterfrom Apr 16, 2020
Merged
Make Windows JAVA_HOME handling consistent with Linux#55261rjernst merged 3 commits intoelastic:masterfrom
rjernst merged 3 commits intoelastic:masterfrom
Conversation
In bash, checking for whether an env variable exists uses the -z test, against a stringified env var, so that the test is actually whether the env var is empty, but not necessarily undefined. We use this to test whether JAVA_HOME is set, to determine whether the bundled jdk should be used. In windows, this test is an actual "undefined" check. This commit brings the behavior on two systems in sync, opting to allow for an empty JAVA_HOME in windows to indicate the bundled jdk should be used. closes elastic#55134
Collaborator
|
Pinging @elastic/es-core-infra (:Core/Infra/Packaging) |
pugnascotia
reviewed
Apr 15, 2020
|
|
||
| public void test54ForceBundledJdkEmptyJavaHome() throws Exception { | ||
| assumeThat(distribution().hasJdk, is(true)); | ||
| // cleanup from previous test |
Contributor
There was a problem hiding this comment.
This does not spark joy.
pugnascotia
approved these changes
Apr 15, 2020
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Apr 16, 2020
In bash, checking for whether an env variable exists uses the -z test, against a stringified env var, so that the test is actually whether the env var is empty, but not necessarily undefined. We use this to test whether JAVA_HOME is set, to determine whether the bundled jdk should be used. In windows, this test is an actual "undefined" check. This commit brings the behavior on two systems in sync, opting to allow for an empty JAVA_HOME in windows to indicate the bundled jdk should be used. closes elastic#55134
rjernst
added a commit
that referenced
this pull request
Apr 16, 2020
In bash, checking for whether an env variable exists uses the -z test, against a stringified env var, so that the test is actually whether the env var is empty, but not necessarily undefined. We use this to test whether JAVA_HOME is set, to determine whether the bundled jdk should be used. In windows, this test is an actual "undefined" check. This commit brings the behavior on two systems in sync, opting to allow for an empty JAVA_HOME in windows to indicate the bundled jdk should be used. closes #55134
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In bash, checking for whether an env variable exists uses the -z test,
against a stringified env var, so that the test is actually whether the
env var is empty, but not necessarily undefined. We use this to test
whether JAVA_HOME is set, to determine whether the bundled jdk should be
used. In windows, this test is an actual "undefined" check. This commit
brings the behavior on two systems in sync, opting to allow for an empty
JAVA_HOME in windows to indicate the bundled jdk should be used.
closes #55134