Fix resolution of test files on Kotlin/Native

kordlib · Jan 29, 2024 · ce463cc · ce463cc
1 parent c68a078
commit ce463cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
@@ -2,6 +2,7 @@ import org.gradle.configurationcache.extensions.capitalized
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
+import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 
 plugins {
     org.jetbrains.kotlin.multiplatform
@@ -84,6 +85,10 @@ tasks {
         environment("PROJECT_ROOT", rootProject.projectDir.absolutePath)
     }
 
+    withType<KotlinNativeTest>().configureEach {
+        environment("PROJECT_ROOT", rootProject.projectDir.absolutePath)
+    }
+
     afterEvaluate {
         val compilationTasks = kotlin.targets.flatMap {
             buildList {

diff --git a/test-kit/src/nativeMain/kotlin/Platform.kt b/test-kit/src/nativeMain/kotlin/Platform.kt
@@ -26,13 +26,13 @@ actual object Platform {
 @OptIn(ExperimentalForeignApi::class)
 actual fun getEnv(name: String) = getenv(name)?.toKString()
 
-actual suspend fun file(project: String, path: String): String = read(path, Source::readString)
+actual suspend fun file(project: String, path: String): String = read(project, path, Source::readString)
 
 actual suspend fun readFile(project: String, path: String): ByteReadChannel =
-    read(path) { ByteReadChannel(readByteArray()) }
+    read(project, path) { ByteReadChannel(readByteArray()) }
 
-private inline fun <T> read(path: String, readerAction: Source.() -> T): T {
-    val actualPath = Path(path)
+private inline fun <T> read(project: String, path: String, readerAction: Source.() -> T): T {
+    val actualPath = Path("${getEnv("PROJECT_ROOT")}/$project/src/commonTest/resources/$path")
     return try {
         SystemFileSystem.source(actualPath).buffered().readerAction()
     } catch (e: Throwable) {