Skip to content

Link to SYSTEM_JAVA_HOME on windows #40806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2019
Merged

Link to SYSTEM_JAVA_HOME on windows #40806

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e52c6c2
Link to SYSTEM_JAVA_HOME on windows
rjernst Apr 3, 2019
5c1fd7c
use rmdir instead of del for symlink on windows
rjernst Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qa/vagrant/src/main/java/org/elasticsearch/packaging/test/ArchiveTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public void test53JavaHomeWithSpecialCharacters() throws Exception {
final Shell sh = new Shell();
try {
// once windows 2012 is no longer supported and powershell 5.0 is always available we can change this command
sh.run("cmd /c mklink /D 'C:\\Program Files (x86)\\java' $Env:JAVA_HOME");
sh.run("cmd /c mklink /D 'C:\\Program Files (x86)\\java' $Env:SYSTEM_JAVA_HOME");

sh.getEnv().put("JAVA_HOME", "C:\\Program Files (x86)\\java");

Expand All @@ -218,7 +218,7 @@ public void test53JavaHomeWithSpecialCharacters() throws Exception {

} finally {
//clean up sym link
sh.run("cmd /c del /F /Q 'C:\\Program Files (x86)\\java' ");
sh.run("cmd /c rmdir 'C:\\Program Files (x86)\\java' ");
Copy link
Contributor

@pgomulka pgomulka Apr 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hopefully it will pass, but I think the problem is the path with spaces (apostrophes didn't help) . Note that del command should pass when run on windows.
If it still fails I would use fileutils.rm

}
});

Expand Down