Adding jps building test with daemon, removing obsolete daemon shutdown code
This commit is contained in:
@@ -70,7 +70,5 @@ public class PluginStartupComponent implements ApplicationComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void disposeComponent() {
|
public void disposeComponent() {}
|
||||||
KotlinCompilerClient.Companion.shutdownCompileService();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,10 @@ package org.jetbrains.kotlin.jps.build
|
|||||||
|
|
||||||
import com.intellij.util.PathUtil
|
import com.intellij.util.PathUtil
|
||||||
import org.jetbrains.jps.model.java.JpsJavaExtensionService
|
import org.jetbrains.jps.model.java.JpsJavaExtensionService
|
||||||
|
import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY
|
||||||
|
import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_ENABLED_PROPERTY
|
||||||
import org.jetbrains.kotlin.test.JetTestUtils
|
import org.jetbrains.kotlin.test.JetTestUtils
|
||||||
|
import java.io.File
|
||||||
|
|
||||||
public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
|
public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
|
||||||
|
|
||||||
@@ -104,4 +107,18 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
|
|||||||
addKotlinRuntimeDependency()
|
addKotlinRuntimeDependency()
|
||||||
rebuildAll()
|
rebuildAll()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public fun testThreeModulesNoReexportWithDaemon() {
|
||||||
|
System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"")
|
||||||
|
val flagFile = File.createTempFile("kotlin-jps-tests-", "-is-running");
|
||||||
|
try {
|
||||||
|
System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath)
|
||||||
|
testThreeModulesNoReexport()
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
flagFile.delete()
|
||||||
|
System.clearProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY)
|
||||||
|
System.clearProperty(COMPILE_DAEMON_ENABLED_PROPERTY)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user