azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation against branch 163

Browse Source 
Original commit: a2b0b3d6eb
This commit is contained in:
Dmitry Jemerov
2016-10-11 18:06:42 +02:00
parent ff0438b38a
commit efd8357035
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+2 -2
View File
@@ -91,7 +91,7 @@ abstract class AbstractIncrementalJpsTest(
private fun enableDebugLogging() { private fun enableDebugLogging() {
com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java) com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java)
TestLoggerFactory.dumpLogToStdout("") TestLoggerFactory.dumpLogToStdout("")
TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org") TestLoggerFactory.enableDebugLogging(testRootDisposable, "#org")
val console = ConsoleAppender() val console = ConsoleAppender()
console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n") console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n")
@@ -268,7 +268,7 @@ abstract class AbstractIncrementalJpsTest(
protected open fun doTest(testDataPath: String) { protected open fun doTest(testDataPath: String) {
testDataDir = File(testDataPath) testDataDir = File(testDataPath)
workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null)
Disposer.register(myTestRootDisposable, Disposable { FileUtilRt.delete(workDir) }) Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) })
val moduleNames = configureModules() val moduleNames = configureModules()
initialMake() initialMake()