summaryrefslogtreecommitdiff
path: root/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java
diff options
context:
space:
mode:
Diffstat (limited to 'platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java')
-rw-r--r--platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java
index 1eebb80e8004..388b9e05fe56 100644
--- a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java
+++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java
@@ -156,9 +156,10 @@ public class Executor {
}
}
- protected static String run(@NotNull List<String> params, boolean ignoreNonZeroExitCode) throws ExecutionException {
+ protected static String run(@NotNull File workingDir, @NotNull List<String> params,
+ boolean ignoreNonZeroExitCode) throws ExecutionException {
final ProcessBuilder builder = new ProcessBuilder().command(params);
- builder.directory(ourCurrentDir());
+ builder.directory(workingDir);
builder.redirectErrorStream(true);
Process clientProcess;
try {
@@ -279,7 +280,8 @@ public class Executor {
return new File(ourCurrentDir, fileName);
}
- private static File ourCurrentDir() {
+ @NotNull
+ protected static File ourCurrentDir() {
assert ourCurrentDir != null : "Current dir hasn't been initialized yet. Call cd at least once before any other command.";
return new File(ourCurrentDir);
}