From 05074bbfd67953b0648c133adf9e217f82efb859 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 3 Jan 2014 11:22:24 +0100
Subject: [PATCH] junit: allow run with working directory $MODULE_DIR$ across
 multiple modules

---
 plugins/junit/src/com/intellij/execution/junit/TestObject.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 28d2b22eea2b..01832d66f084 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -433,7 +433,7 @@ public abstract class TestObject implements JavaCommandLine {
   private void appendForkInfo(Executor executor) throws ExecutionException {
     final String forkMode = myConfiguration.getForkMode();
     if (Comparing.strEqual(forkMode, "none")) {
-      if (forkPerModule()) {
+      if (forkPerModule() && getRunnerSettings() != null) {
         final String actionName = UIUtil.removeMnemonic(executor.getStartActionText());
         throw new CantRunException("'" + actionName + "' is disabled when per-module working directory is configured.<br/>" +
                                    "Please specify single working directory, or change test scope to single module.");