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

HMPP. Fix tests after parameterization of NativePlatform

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-04-13 12:52:38 +07:00
parent 8d2e999776
commit b108b0f8c4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/projectModel/Parser.kt
+6 -4
View File
@@ -9,6 +9,7 @@ import com.intellij.util.text.nullize
import org.jetbrains.kotlin.platform.CommonPlatforms import org.jetbrains.kotlin.platform.CommonPlatforms
import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.platform.konan.NativePlatforms
import java.io.File import java.io.File
import java.io.InputStreamReader import java.io.InputStreamReader
import java.io.Reader import java.io.Reader
@@ -125,12 +126,13 @@ open class ProjectStructureParser(private val projectRoot: File) {
.toMap() .toMap()
val platforms = parseRepeatableAttribute(platformString).map { val platforms = parseRepeatableAttribute(platformString).map {
if (it == "JVM") when (it) {
JvmPlatforms.defaultJvmPlatform.single() "JVM" -> JvmPlatforms.defaultJvmPlatform.single()
else "Native" -> NativePlatforms.unspecifiedNativePlatform.single()
platformsByPlatformName[it] ?: error( else -> platformsByPlatformName[it] ?: error(
"Unknown platform $it. Available platforms: ${platformsByPlatformName.keys.joinToString()}" "Unknown platform $it. Available platforms: ${platformsByPlatformName.keys.joinToString()}"
) )
}
}.toSet() }.toSet()
return TargetPlatform(platforms) return TargetPlatform(platforms)