Adding jps building test with daemon, removing obsolete daemon shutdown code

This commit is contained in:
Ilya Chernikov
2015-09-08 18:17:45 +02:00
parent 96558c52ff
commit b1bdbaf06a
2 changed files with 18 additions and 3 deletions
@@ -70,7 +70,5 @@ public class PluginStartupComponent implements ApplicationComponent {
}
@Override
public void disposeComponent() {
KotlinCompilerClient.Companion.shutdownCompileService();
}
public void disposeComponent() {}
}
@@ -18,7 +18,10 @@ package org.jetbrains.kotlin.jps.build
import com.intellij.util.PathUtil
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 java.io.File
public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
@@ -104,4 +107,18 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
addKotlinRuntimeDependency()
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)
}
}
}