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

[K/N][test] Fix Native downloading test

Browse Source 
Use a newer version of the compiler with changes to archive name
(contains arch). Also, remove obsolete test for the old version.

Merge-request: KT-MR-10399
Merged-by: Pavel Punegov <Pavel.Punegov@jetbrains.com>
This commit is contained in:
Pavel Punegov
2023-06-01 15:09:51 +00:00
committed by Space Team
parent b19decc00a
commit 6d06f29326
2 changed files with 10 additions and 21 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/GeneralNativeIT.kt
+9 -21
View File
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.gradle.internals.DISABLED_NATIVE_TARGETS_REPORTER_WA
import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind
import org.jetbrains.kotlin.gradle.testbase.*
import org.jetbrains.kotlin.gradle.testbase.TestVersions.Kotlin.NATIVE_STABLE_RELEASE
import org.jetbrains.kotlin.gradle.util.modify
import org.jetbrains.kotlin.gradle.util.runProcess
import org.jetbrains.kotlin.gradle.utils.Xcode
@@ -940,36 +941,23 @@ class GeneralNativeIT : BaseGradleIT() {
assertNoDiagnostic(KotlinToolingDiagnostics.NativeStdlibIsMissingDiagnostic)
}
build("tasks", "-Pkotlin.native.version=1.5.20") {
val platform = HostManager.platformName()
val version = NATIVE_STABLE_RELEASE
val escapedRegexVersion = Regex.escape(NATIVE_STABLE_RELEASE)
build("tasks", "-Pkotlin.native.version=$version") {
assertSuccessful()
assertContainsRegex(
"Kotlin/Native distribution: .*kotlin-native-prebuilt-(macos|linux|windows)-1\\.5\\.20"
.toRegex()
)
assertContainsRegex("Kotlin/Native distribution: .*kotlin-native-prebuilt-$platform-$escapedRegexVersion".toRegex())
assertNotContains("Project property 'org.jetbrains.kotlin.native.version' is deprecated")
}
// Deprecated property
build("tasks", "-Porg.jetbrains.kotlin.native.version=1.5.20") {
build("tasks", "-Porg.jetbrains.kotlin.native.version=$version") {
assertSuccessful()
assertContainsRegex(
"Kotlin/Native distribution: .*kotlin-native-prebuilt-(macos|linux|windows)-1\\.5\\.20"
.toRegex()
)
assertContainsRegex("Kotlin/Native distribution: .*kotlin-native-prebuilt-$platform-$escapedRegexVersion".toRegex())
assertContains("Project property 'org.jetbrains.kotlin.native.version' is deprecated")
}
}
// Gradle 5.0 introduced a new API for Ivy repository layouts.
// MPP plugin uses this API to download K/N if Gradle version is >= 5.0.
// Check this too (see KT-30258).
with(Project("native-libraries")) {
build("tasks", "-Pkotlin.native.version=1.3.50") {
assertSuccessful()
assertTrue(output.contains("Kotlin/Native distribution: "))
assertFalse(output.contains("Deprecated Gradle features were used in this build, making it incompatible with Gradle 6.0."))
}
}
}
@Test
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
+1
View File
@@ -32,6 +32,7 @@ interface TestVersions {
object Kotlin {
const val STABLE_RELEASE = "1.6.21"
const val NATIVE_STABLE_RELEASE = "1.8.20"
// Copied from KOTLIN_VERSION.kt file
val CURRENT