From 5f6641fa32af28a68c12c9740532b3cc2762eef6 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 10 Apr 2015 19:54:49 +0200
Subject: [PATCH] junit/testng: do not pass unprocessed program params to tests
 process

---
 .../execution/JavaTestFrameworkRunnableState.java        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index c36d9c52bf79..2b909ea2def4 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -157,7 +157,14 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
       ext.updateJavaParameters(getConfiguration(), javaParameters, getRunnerSettings());
     }
 
-    JavaParametersUtil.configureConfiguration(javaParameters, getConfiguration());
+    final String parameters = getConfiguration().getProgramParameters();
+    getConfiguration().setProgramParameters(null);
+    try {
+      JavaParametersUtil.configureConfiguration(javaParameters, getConfiguration());
+    }
+    finally {
+      getConfiguration().setProgramParameters(parameters);
+    }
     JavaSdkUtil.addRtJar(javaParameters.getClassPath());
 
     configureClasspath(javaParameters);