From 9c3de4332f2aeba049fcd21460230541cd94085c Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 10 Jan 2024 08:26:26 +0100 Subject: [PATCH] [ObjCExport] Run new ObjCExport tests as native tests on CI ^KT-64839 Fixed --- kotlin-native/backend.native/tests/build.gradle | 1 + native/objcexport-header-generator/build.gradle.kts | 4 ++-- .../impl/analysis-api/build.gradle.kts | 2 +- native/objcexport-header-generator/impl/k1/build.gradle.kts | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index 704f61f7a0c..d9550471178 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -188,6 +188,7 @@ tasks.named("run") { dependsOn(":kotlin-native:Interop:Indexer:check") dependsOn(":kotlin-native:Interop:StubGenerator:check") dependsOn(":native:kotlin-native-utils:check") + dependsOn(":native:objcexport-header-generator:check") dependsOn(":kotlin-native:backend.native:check") } diff --git a/native/objcexport-header-generator/build.gradle.kts b/native/objcexport-header-generator/build.gradle.kts index 96d7c5d9e39..4ef3befe3dd 100644 --- a/native/objcexport-header-generator/build.gradle.kts +++ b/native/objcexport-header-generator/build.gradle.kts @@ -45,13 +45,13 @@ tasks.test.configure { enabled = false } -nativeTest("testK1", tag = null) { +nativeTest("testK1", tag = null, requirePlatformLibs = true) { useJUnitPlatform() enableJunit5ExtensionsAutodetection() classpath += k1TestRuntimeClasspath } -nativeTest("testAnalysisApi", tag = null) { +nativeTest("testAnalysisApi", tag = null, requirePlatformLibs = true) { useJUnitPlatform() enableJunit5ExtensionsAutodetection() testClassesDirs += files(sourceSets.test.map { it.output.classesDirs }) diff --git a/native/objcexport-header-generator/impl/analysis-api/build.gradle.kts b/native/objcexport-header-generator/impl/analysis-api/build.gradle.kts index b21759c615f..8f45a6eabb7 100644 --- a/native/objcexport-header-generator/impl/analysis-api/build.gradle.kts +++ b/native/objcexport-header-generator/impl/analysis-api/build.gradle.kts @@ -27,7 +27,7 @@ sourceSets { testsJar() -nativeTest("test", tag = null) { +nativeTest("test", tag = null, requirePlatformLibs = true) { useJUnitPlatform() enableJunit5ExtensionsAutodetection() } diff --git a/native/objcexport-header-generator/impl/k1/build.gradle.kts b/native/objcexport-header-generator/impl/k1/build.gradle.kts index 423a01c3823..cb760a56fff 100644 --- a/native/objcexport-header-generator/impl/k1/build.gradle.kts +++ b/native/objcexport-header-generator/impl/k1/build.gradle.kts @@ -25,7 +25,7 @@ kotlin { testsJar() -nativeTest("test", tag = null) { +nativeTest("test", tag = null, requirePlatformLibs = true) { useJUnitPlatform() enableJunit5ExtensionsAutodetection() }