[IDE, native] Update mock K/N dist: fully qualified klib names
This commit is contained in:
Ilya Matveev
+6
-1
@@ -154,7 +154,12 @@ private fun assertValidNativeLibrary(library: Library, projectRoot: String) {
|
||||
.relativeTo(File(projectRoot).resolve(DOUBLE_DOT_PATH).normalize())
|
||||
.relativeTo(FAKE_KOTLIN_NATIVE_HOME_RELATIVE_PATH)
|
||||
|
||||
val expectedShortPath = if (platform.isEmpty()) konanCommonLibraryPath(name) else konanPlatformLibraryPath(name, platform)
|
||||
val expectedDirectoryName = if (name == "stdlib") name else "org.jetbrains.kotlin.native.$name"
|
||||
val expectedShortPath = if (platform.isEmpty()) {
|
||||
konanCommonLibraryPath(expectedDirectoryName)
|
||||
} else {
|
||||
konanPlatformLibraryPath(expectedDirectoryName, platform)
|
||||
}
|
||||
assertEquals("The short path of $fullName does not match its location", expectedShortPath, actualShortPath)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
unique_name=stdlib
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=CFNetwork
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.CFNetwork
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=CFNetwork
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=Foundation
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=CFNetwork
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.CFNetwork
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=CFNetwork
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=Foundation
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=linux
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.linux
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=linux
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.posix
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=posix
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.zlib
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=zlib
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=posix
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=zlib
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=UIKit
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=objc
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=Foundation
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.UIKit
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=UIKit
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.objc
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=objc
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=iconv
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=opengl32
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.iconv
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=iconv
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.opengl32
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=opengl32
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.windows
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=windows
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=windows
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=WatchKit
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=Foundation
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.WatchKit
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=WatchKit
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
unique_name=WatchKit
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.Foundation
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=Foundation
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
unique_name=org.jetbrains.kotlin.native.WatchKit
|
||||
compiler_version=1.0.0
|
||||
builtins_platform=NATIVE
|
||||
short_name=WatchKit
|
||||
Reference in New Issue
Block a user