From efd8357035c311b60adf08299d888ee898f7dc16 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 11 Oct 2016 18:06:42 +0200 Subject: [PATCH] fix compilation against branch 163 Original commit: a2b0b3d6ebfdd16981ea5b5cf936ce157e5b9654 --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 957e78df221..94a41420acc 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -91,7 +91,7 @@ abstract class AbstractIncrementalJpsTest( private fun enableDebugLogging() { com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java) TestLoggerFactory.dumpLogToStdout("") - TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org") + TestLoggerFactory.enableDebugLogging(testRootDisposable, "#org") val console = ConsoleAppender() console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n") @@ -268,7 +268,7 @@ abstract class AbstractIncrementalJpsTest( protected open fun doTest(testDataPath: String) { testDataDir = File(testDataPath) 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() initialMake()