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

Fix unstable TryK2IT.smokeTestForNativeTasks test

Browse Source 
fix test fails with unexpected task execution order


Merge-request: KT-MR-12327
Merged-by: Nataliya Valtman <Nataliya.Valtman@jetbrains.com>
This commit is contained in:
Nataliya.Valtman
2023-09-22 08:09:32 +00:00
committed by Space Team
parent 70ea0de2db
commit e4fc375900
2 changed files with 5 additions and 5 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/experimental/TryK2IT.kt
+4 -4
View File
@@ -87,8 +87,8 @@ class TryK2IT : KGPBaseTest() {
assertOutputContains( assertOutputContains(
""" """
|##### 'kotlin.experimental.tryK2' results ##### |##### 'kotlin.experimental.tryK2' results #####
|:lib:compileKotlin: 2.0 language version
|:app:compileKotlin: 2.0 language version |:app:compileKotlin: 2.0 language version
|:lib:compileKotlin: 2.0 language version
|##### 100% (2/2) tasks have been compiled with Kotlin 2.0 ##### |##### 100% (2/2) tasks have been compiled with Kotlin 2.0 #####
""".trimMargin().normalizeLineEndings() """.trimMargin().normalizeLineEndings()
) )
@@ -112,13 +112,13 @@ class TryK2IT : KGPBaseTest() {
""" """
|##### 'kotlin.experimental.tryK2' results ##### |##### 'kotlin.experimental.tryK2' results #####
|:compileCommonMainKotlinMetadata: 2.0 language version |:compileCommonMainKotlinMetadata: 2.0 language version
|:compileNativeMainKotlinMetadata: 2.0 language version
|:compileKotlinLinuxX64: 2.0 language version${ |:compileKotlinLinuxX64: 2.0 language version${
if (HostManager.hostIsMac) if (HostManager.hostIsMac)
"\n|:compileKotlinMacosArm64: 2.0 language version\n|:compileKotlinMacosX64: 2.0 language version" "\n|:compileKotlinMacosArm64: 2.0 language version\n|:compileKotlinMacosX64: 2.0 language version"
else "" else ""
} }
|:compileKotlinMingwX64: 2.0 language version |:compileKotlinMingwX64: 2.0 language version
|:compileNativeMainKotlinMetadata: 2.0 language version
|##### 100% ${if (HostManager.hostIsMac) "(6/6)" else "(4/4)"} tasks have been compiled with Kotlin 2.0 ##### |##### 100% ${if (HostManager.hostIsMac) "(6/6)" else "(4/4)"} tasks have been compiled with Kotlin 2.0 #####
""".trimMargin().normalizeLineEndings() """.trimMargin().normalizeLineEndings()
) )
@@ -148,8 +148,8 @@ class TryK2IT : KGPBaseTest() {
assertOutputContains( assertOutputContains(
""" """
|##### 'kotlin.experimental.tryK2' results ##### |##### 'kotlin.experimental.tryK2' results #####
|:lib:compileKotlin: 2.0 language version
|:app:compileKotlin: 2.0 language version |:app:compileKotlin: 2.0 language version
|:lib:compileKotlin: 2.0 language version
|##### 100% (2/2) tasks have been compiled with Kotlin 2.0 ##### |##### 100% (2/2) tasks have been compiled with Kotlin 2.0 #####
""".trimMargin().normalizeLineEndings() """.trimMargin().normalizeLineEndings()
) )
@@ -294,8 +294,8 @@ class TryK2IT : KGPBaseTest() {
|##### 'kotlin.experimental.tryK2' results ##### |##### 'kotlin.experimental.tryK2' results #####
|:compileKotlinJs: 2.0 language version |:compileKotlinJs: 2.0 language version
|:compileProductionExecutableKotlinJs: 2.0 language version |:compileProductionExecutableKotlinJs: 2.0 language version
|:compileTestKotlinJs: 2.0 language version
|:compileTestDevelopmentExecutableKotlinJs: 2.0 language version |:compileTestDevelopmentExecutableKotlinJs: 2.0 language version
|:compileTestKotlinJs: 2.0 language version
|##### 100% (4/4) tasks have been compiled with Kotlin 2.0 ##### |##### 100% (4/4) tasks have been compiled with Kotlin 2.0 #####
""".trimMargin().normalizeLineEndings() """.trimMargin().normalizeLineEndings()
) )
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportsService.kt
+1 -1
View File
@@ -280,7 +280,7 @@ class BuildReportsService {
} }
val taskWithK2Percent = (tasksCountWithKotlin2 * 100) / tasksData.count() val taskWithK2Percent = (tasksCountWithKotlin2 * 100) / tasksData.count()
val statsData = tasksData.map { it.path to it.kotlinLanguageVersion?.version } val statsData = tasksData.map { it.path to it.kotlinLanguageVersion?.version }
statsData.forEach { record -> statsData.sortedBy { it.first }.forEach { record ->
log.warn("${record.first}: ${record.second} language version") log.warn("${record.first}: ${record.second} language version")
} }
log.warn( log.warn(