Fix unstable TryK2IT.smokeTestForNativeTasks test

fix test fails with unexpected task execution order cherry-picked from e4fc375
JetBrains · Oct 20, 2023 · 5cbfe24 · 5cbfe24
1 parent 9bf9cb4
commit 5cbfe24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...gin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt b/...gin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt
@@ -87,8 +87,8 @@ class TryK2IT : KGPBaseTest() {
                 assertOutputContains(
                     """
                     |##### 'kotlin.experimental.tryK2' results #####
-                    |:lib: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 #####
                     """.trimMargin().normalizeLineEndings()
                 )
@@ -112,13 +112,13 @@ class TryK2IT : KGPBaseTest() {
                     """
                     |##### 'kotlin.experimental.tryK2' results #####
                     |:compileCommonMainKotlinMetadata: 2.0 language version
-                    |:compileNativeMainKotlinMetadata: 2.0 language version
                     |:compileKotlinLinuxX64: 2.0 language version${
                         if (HostManager.hostIsMac)
                             "\n|:compileKotlinMacosArm64: 2.0 language version\n|:compileKotlinMacosX64: 2.0 language version"
                         else ""
                     }
                     |: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 #####
                     """.trimMargin().normalizeLineEndings()
                 )
@@ -148,8 +148,8 @@ class TryK2IT : KGPBaseTest() {
                 assertOutputContains(
                     """
                     |##### 'kotlin.experimental.tryK2' results #####
-                    |:lib: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 #####
                     """.trimMargin().normalizeLineEndings()
                 )
@@ -294,8 +294,8 @@ class TryK2IT : KGPBaseTest() {
                     |##### 'kotlin.experimental.tryK2' results #####
                     |:compileKotlinJs: 2.0 language version
                     |:compileProductionExecutableKotlinJs: 2.0 language version
-                    |:compileTestKotlinJs: 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 #####
                     """.trimMargin().normalizeLineEndings()
                 )

diff --git a/...gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportsService.kt b/...gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportsService.kt
@@ -280,7 +280,7 @@ class BuildReportsService {
             }
             val taskWithK2Percent = (tasksCountWithKotlin2 * 100) / tasksData.count()
             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(