Enable JPS test runner for new JPS build (KT-29368)

#KT-29368 Fixed
This commit is contained in:
Nikolay Krasko
2019-01-29 15:50:07 +03:00
parent c9e2ed4e1f
commit 52c46811ff
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -272,7 +272,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
addOrReplaceOptionValue("idea.home.path", platformDirProjectRelative)
addOrReplaceOptionValue("ideaSdk.androidPlugin.path", platformDirProjectRelative + "/plugins/android/lib")
addOrReplaceOptionValue("robolectric.classpath", robolectricClasspath)
addOrReplaceOptionValue("use.pill", "true")
addOrReplaceOptionValue("use.jps", "true")
val isAndroidStudioBunch = project.findProperty("versions.androidStudioRelease") != null
addOrReplaceOptionValue("idea.platform.prefix", if (isAndroidStudioBunch) "AndroidStudio" else null)
@@ -36,7 +36,7 @@ public class JUnit3RunnerWithInners extends Runner implements Filterable, Sortab
public JUnit3RunnerWithInners(Class<?> klass) {
super();
if ("true".equals(System.getProperty("use.pill"))) {
if ("true".equals(System.getProperty("use.jps"))) {
delegateRunner = new JUnit3RunnerWithInnersForJPS(klass);
}
else {
+2 -1
View File
@@ -19,7 +19,8 @@ fun org.jetbrains.gradle.ext.JUnit.configureForKotlin() {
"-Didea.is.unit.test=true",
"-Didea.home.path=$ideaSdkPath",
"-Djps.kotlin.home=${ideaPluginDir.absolutePath}",
"-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false"
"-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false",
"-Duse.jps=true"
).joinToString(" ")
envs = mapOf(
"NO_FS_ROOTS_ACCESS_CHECK" to "true",