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

[IR, JS] KLIB ABI tests: don't create unnecessary disposable

Browse Source 
^KT-50775
This commit is contained in:
Dmitriy Dolovov
2022-01-18 20:32:22 +03:00
parent 3ec4a8d6f3
commit 703fd8539d
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibABITestCase.kt
+3 -5
View File
@@ -52,15 +52,13 @@ abstract class AbstractKlibABITestCase : KtUsefulTestCase() {
modulesMap[module] = parseModuleInfo(module, moduleInfoFile) modulesMap[module] = parseModuleInfo(module, moduleInfoFile)
} }
val disposable = TestDisposable() val environment = createEnvironment()
val environment = createEnvironment(disposable)
val buildDir = createTempDirectory().toFile().also { it.mkdirs() } val buildDir = createTempDirectory().toFile().also { it.mkdirs() }
try { try {
doTestImpl(environment, testDir, buildDir, projectInfo, modulesMap) doTestImpl(environment, testDir, buildDir, projectInfo, modulesMap)
} finally { } finally {
buildDir.deleteRecursively() buildDir.deleteRecursively()
disposable.dispose()
} }
} }
@@ -89,8 +87,8 @@ abstract class AbstractKlibABITestCase : KtUsefulTestCase() {
return modulesBuildDirs return modulesBuildDirs
} }
private fun createEnvironment(disposable: TestDisposable): KotlinCoreEnvironment { private fun createEnvironment(): KotlinCoreEnvironment {
return KotlinCoreEnvironment.createForTests(disposable, CompilerConfiguration(), EnvironmentConfigFiles.JS_CONFIG_FILES) return KotlinCoreEnvironment.createForTests(testRootDisposable, CompilerConfiguration(), EnvironmentConfigFiles.JS_CONFIG_FILES)
} }
private fun collectDependenciesKlib(buildDir: File, dependencies: Collection<String>): List<String> { private fun collectDependenciesKlib(buildDir: File, dependencies: Collection<String>): List<String> {