MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use Git from PATH in tests

Browse Source
This commit is contained in:
Ivan Semenov
2018-03-08 13:24:42 +03:00
parent d58d4ccd5f
commit 39452636c5
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-tests/src/com/intellij/testFramework/vcs/ExecutableHelper.java
+5 -7
View File
@@ -23,8 +23,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
/**
* @author Sergey Karashevich
@@ -34,17 +34,16 @@ public class ExecutableHelper {
private static final Logger LOG = Logger.getInstance(ExecutableHelper.class);
private static final String GIT_EXECUTABLE_ENV = "IDEA_TEST_GIT_EXECUTABLE";
private static final String TEAMCITY_GIT_EXECUTABLE_ENV = "TEAMCITY_GIT_PATH";
public static String findGitExecutable() {
return findExecutable("Git", "git", "git.exe", Arrays.asList(GIT_EXECUTABLE_ENV, TEAMCITY_GIT_EXECUTABLE_ENV));
return findExecutable("Git", "git", "git.exe", Collections.singletonList(GIT_EXECUTABLE_ENV));
}
@NotNull
public static String findExecutable(@NotNull String programName,
@NotNull String unixExec,
@NotNull String winExec,
@NotNull Collection<String> envs) {
@NotNull String unixExec,
@NotNull String winExec,
@NotNull Collection<String> envs) {
String exec = findEnvValue(programName, envs);
if (exec != null) {
return exec;
@@ -78,5 +77,4 @@ public class ExecutableHelper {
LOG.info(msg);
}
}
}