Skip to content
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

Simplify SymLink creation in eclipse.core.tests #1486

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Simplify SymLink creation in eclipse.core.tests #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd77681
Simplify SymLink creation in eclipse.core.tests
HannesWell Jul 30, 2024
18f2896
Version bump(s) for 4.35 stream
eclipse-platform-bot Nov 26, 2024
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
2 changes: 1 addition & 1 deletion runtime/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Core Tests Harness
Bundle-SymbolicName: org.eclipse.core.tests.harness;singleton:=true
Bundle-Version: 3.17.100.qualifier
Bundle-Version: 3.17.200.qualifier
Bundle-Vendor: Eclipse.org
Export-Package: org.eclipse.core.tests.harness;version="2.0",
org.eclipse.core.tests.harness.session,
Expand Down
45 changes: 1 addition & 44 deletions ...s/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@
import static org.eclipse.core.tests.harness.TestHarnessPlugin.PI_HARNESS;
import static org.eclipse.core.tests.harness.TestHarnessPlugin.log;

import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.file.Files;
import java.nio.file.Path;
import org.eclipse.core.runtime.ILog;
Expand Down Expand Up @@ -121,48 +119,7 @@ public static void clear(java.io.File file) {
*/
public static void createSymLink(File basedir, String linkName, String linkTarget, boolean isDir)
throws IOException {
// The following code creates even a link if
// Files.createSymbolicLink(new File(basedir, linkName).toPath(), new
// File(basedir, linkTarget).toPath());
// would throw java.nio.file.FileSystemException "missing rights"
//
Process process = startSymlinkCreation(basedir, linkName, linkTarget, isDir);
try {
int exitcode = process.waitFor();
if (exitcode != 0) {
// xxx wrong charset. from jdk17+ we could use Console.charset()
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
String result = reader.readLine();
throw new IllegalStateException("Creating symlink is unsupported: " + result);
}
}
} catch (InterruptedException e) {
throw new IOException("Creating symlink failed due to interrupted exception", e);
}
}

private static Process startSymlinkCreation(File basedir, String linkName, String linkTarget, boolean isDir)
throws IOException {
// Deliberately use an empty environment to make the test reproducible.
String[] environmentParameters = {};
if (Platform.getOS().equals(Platform.OS_WIN32)) {
return startSymlinkCreationOnWindows(basedir, linkName, linkTarget, isDir, environmentParameters);
}
String[] cmd = { "ln", "-s", linkTarget, linkName };
return Runtime.getRuntime().exec(cmd, environmentParameters, basedir);
}

private static Process startSymlinkCreationOnWindows(File basedir, String linkName, String linkTarget,
boolean isDir, String[] environmentParameters) throws IOException {
// use File.getPath to avoid 'Illegal argument - ".."' for using "../"
// instead of "..\"
if (isDir) {
String[] cmd = { "cmd", "/c", "mklink", "/d", new File(linkName).getPath(),
new File(linkTarget).getPath() };
return Runtime.getRuntime().exec(cmd, environmentParameters, basedir);
}
String[] cmd = { "cmd", "/c", "mklink", new File(linkName).getPath(), new File(linkTarget).getPath() };
return Runtime.getRuntime().exec(cmd, environmentParameters, basedir);
Files.createSymbolicLink(basedir.toPath().resolve(linkName), basedir.toPath().resolve(linkTarget));
}

/**
Expand Down
Loading