[Native][tests] Don't use trove4j in K/N new test infra
This commit is contained in:
committed by
Space Team
parent
ce9a45bf92
commit
da2e6d93ff
@@ -24,7 +24,6 @@ dependencies {
|
||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-metadata-klib"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
|
||||
|
||||
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
|
||||
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -5,13 +5,12 @@
|
||||
|
||||
package org.jetbrains.kotlin.konan.blackboxtest.support.settings
|
||||
|
||||
import gnu.trove.THashMap
|
||||
import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue
|
||||
import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
internal abstract class Settings(private val parent: Settings?, settings: Iterable<Any>) {
|
||||
private val map: Map<KClass<*>, Any> = THashMap<KClass<*>, Any>().apply {
|
||||
private val map: Map<KClass<*>, Any> = buildMap {
|
||||
settings.forEach {
|
||||
val settingClass: KClass<*>
|
||||
val setting: Any
|
||||
|
||||
@@ -252,8 +252,7 @@ class CodeConformanceTest : TestCase() {
|
||||
"native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeSignature.kt",
|
||||
"native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt",
|
||||
"native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt",
|
||||
"native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/misc.kt",
|
||||
"native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt"
|
||||
"native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/misc.kt"
|
||||
)
|
||||
) { _, source ->
|
||||
"gnu.trove" in source
|
||||
|
||||
Reference in New Issue
Block a user