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

[Gradle, Native, IT] Workaround NativeEmbeddableCompilerJarIT on Apple silicon

Browse Source 
The tests fail on Apple silicon because Gradle plugin doesn't provide
run tasks for macosArm64 (KT-48649).

Workaround this by making the tests execute link task instead of run.
This commit is contained in:
Svyatoslav Scherbina
2021-09-17 11:29:32 +03:00
committed by Space
parent 064cffc89c
commit b656d67bd4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeEmbeddableCompilerJarIT.kt
+6 -6
View File
@@ -25,7 +25,7 @@ class NativeEmbeddableCompilerJarIT : BaseGradleIT() {
@Test @Test
fun testDefault() = with(transformNativeTestProjectWithPluginDsl("executables", directoryPrefix = "native-binaries")) { fun testDefault() = with(transformNativeTestProjectWithPluginDsl("executables", directoryPrefix = "native-binaries")) {
build(":runDebugExecutableHost") { build(":linkDebugExecutableHost") {
assertSuccessful() assertSuccessful()
checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") { checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") {
assertTrue(it.includesRegularJar()) assertTrue(it.includesRegularJar())
@@ -36,7 +36,7 @@ class NativeEmbeddableCompilerJarIT : BaseGradleIT() {
@Test @Test
fun testEmbeddableJarFalse() = with(transformNativeTestProjectWithPluginDsl("executables", directoryPrefix = "native-binaries")) { fun testEmbeddableJarFalse() = with(transformNativeTestProjectWithPluginDsl("executables", directoryPrefix = "native-binaries")) {
build(":runDebugExecutableHost", "-Pkotlin.native.useEmbeddableCompilerJar=false") { build(":linkDebugExecutableHost", "-Pkotlin.native.useEmbeddableCompilerJar=false") {
assertSuccessful() assertSuccessful()
checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") { checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") {
assertTrue(it.includesRegularJar()) assertTrue(it.includesRegularJar())
@@ -47,7 +47,7 @@ class NativeEmbeddableCompilerJarIT : BaseGradleIT() {
@Test @Test
fun testEmbeddableJarTrue() = with(transformNativeTestProjectWithPluginDsl("executables", directoryPrefix = "native-binaries")) { fun testEmbeddableJarTrue() = with(transformNativeTestProjectWithPluginDsl("executables", directoryPrefix = "native-binaries")) {
build(":runDebugExecutableHost", "-Pkotlin.native.useEmbeddableCompilerJar=true") { build(":linkDebugExecutableHost", "-Pkotlin.native.useEmbeddableCompilerJar=true") {
assertSuccessful() assertSuccessful()
checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") { checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") {
assertFalse(it.includesRegularJar()) assertFalse(it.includesRegularJar())
@@ -58,7 +58,7 @@ class NativeEmbeddableCompilerJarIT : BaseGradleIT() {
@Test @Test
fun testSwitch() = with(transformNativeTestProjectWithPluginDsl("executables", directoryPrefix = "native-binaries")) { fun testSwitch() = with(transformNativeTestProjectWithPluginDsl("executables", directoryPrefix = "native-binaries")) {
build(":runDebugExecutableHost") { build(":linkDebugExecutableHost") {
assertSuccessful() assertSuccessful()
checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") { checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") {
assertTrue(it.includesRegularJar()) assertTrue(it.includesRegularJar())
@@ -66,11 +66,11 @@ class NativeEmbeddableCompilerJarIT : BaseGradleIT() {
} }
} }
build(":runDebugExecutableHost") { build(":linkDebugExecutableHost") {
assertTasksUpToDate(":linkDebugExecutableHost", ":compileKotlinHost") assertTasksUpToDate(":linkDebugExecutableHost", ":compileKotlinHost")
} }
build(":runDebugExecutableHost", "-Pkotlin.native.useEmbeddableCompilerJar=true") { build(":linkDebugExecutableHost", "-Pkotlin.native.useEmbeddableCompilerJar=true") {
assertSuccessful() assertSuccessful()
assertTasksExecuted(":linkDebugExecutableHost", ":compileKotlinHost") assertTasksExecuted(":linkDebugExecutableHost", ":compileKotlinHost")
checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") { checkNativeCompilerClasspath(":linkDebugExecutableHost", ":compileKotlinHost") {