diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt index a3c4e8e5ef4..74bcf647ce1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt @@ -694,11 +694,11 @@ class GeneralNativeIT : BaseGradleIT() { assertTasksSkipped(*testsToSkip.toTypedArray()) - fun assertStacktrace(taskName: String) { + fun assertStacktrace(taskName: String, targetName: String) { val testReport = projectDir.resolve("build/test-results/$taskName/TEST-org.foo.test.TestKt.xml") val stacktrace = SAXBuilder().build(testReport).rootElement .getChildren("testcase") - .single { it.getAttribute("name").value == "fail" } + .single { it.getAttribute("name").value == "fail" || it.getAttribute("name").value == "fail[$targetName]" } .getChild("failure") .text assertTrue(stacktrace.contains("""at org\.foo\.test#fail\(.*test\.kt:24\)""".toRegex())) @@ -741,7 +741,7 @@ class GeneralNativeIT : BaseGradleIT() { expectedTestResults[1], "iosTest" ) - assertStacktrace("iosTest") + assertStacktrace("iosTest", "ios") } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/TEST-TestKt-iOSsim.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/TEST-TestKt-iOSsim.xml index c52f4e18616..37be5b49672 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/TEST-TestKt-iOSsim.xml +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/TEST-TestKt-iOSsim.xml @@ -4,7 +4,7 @@ - + ...