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

Gradle, js, tests: don't add prefix if platform and/or sub target name is null

Browse Source
This commit is contained in:
Sergey Rostov
2019-05-16 12:10:50 +03:00
parent 5d8f2acf5f
commit 9a6a2e14a5
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
+3 -1
View File
@@ -79,7 +79,9 @@ abstract class KotlinJsSubTarget(
} }
testJs.compilation = compilation testJs.compilation = compilation
testJs.targetName = target.disambiguationClassifier + "," + disambiguationClassifier testJs.targetName = listOfNotNull(target.disambiguationClassifier, disambiguationClassifier)
.takeIf { it.isNotEmpty() }
?.joinToString()
testJs.configureConventions() testJs.configureConventions()
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+3 -1
View File
@@ -270,7 +270,9 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
val browser = withoutOs.substring(rawSuiteNameOnly.length + 1) // HeadlessChrome 74.0.3729 val browser = withoutOs.substring(rawSuiteNameOnly.length + 1) // HeadlessChrome 74.0.3729
.replace(" ", "") // HeadlessChrome74.0.3729 .replace(" ", "") // HeadlessChrome74.0.3729
testNameSuffix = "$baseTestNameSuffix,$browser,$os" testNameSuffix = listOfNotNull(baseTestNameSuffix, browser, os)
.takeIf { it.isNotEmpty() }
?.joinToString()
return rawSuiteNameOnly.replace(" ", ".") // sample.a.DeepPackageTest.Inner return rawSuiteNameOnly.replace(" ", ".") // sample.a.DeepPackageTest.Inner
} }