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

Merge 'getTestJdkKind' and 'getJdkKind' and move to base class

Browse Source
This commit is contained in:
Mikhael Bogdanov
2020-02-25 11:32:41 +01:00
parent 6e855f3bbd
commit 999b762288
15 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt
+1 -3
View File
@@ -16,11 +16,9 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TargetBackend
import org.jetbrains.kotlin.utils.rethrow
import java.io.File
import java.nio.file.Paths
import java.util.*
import java.util.concurrent.TimeUnit
abstract class AbstractCompileKotlinAgainstKlibTest : AbstractBlackBoxCodegenTest() {
lateinit var klibName: String
@@ -35,7 +33,7 @@ abstract class AbstractCompileKotlinAgainstKlibTest : AbstractBlackBoxCodegenTes
val classpath: MutableList<File> = ArrayList()
classpath.add(KotlinTestUtils.getAnnotationsJar())
val configuration = createConfiguration(
configurationKind, CodegenTestCase.getJdkKind(files),
configurationKind, getTestJdkKind(files),
classpath,
listOf(outputDir),
files