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

Use 'teamcity.version' property to detect CI in K/N tests

Browse Source
This commit is contained in:
Ilya Matveev
2018-09-10 20:36:31 +03:00
committed by Ilya Matveev
parent 0ac701d8bf
commit f7949a2131
2 changed files with 2 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/plugin/KotlinTargetConfigurator.kt
+1 -1
View File
@@ -404,7 +404,7 @@ open class KotlinNativeTargetConfigurator(
// TODO: Provide a normal test path! // TODO: Provide a normal test path!
outputDir = project.layout.buildDirectory.dir("test-results").get().asFile outputDir = project.layout.buildDirectory.dir("test-results").get().asFile
if (project.hasProperty("teamcity")) { if (project.hasProperty("teamcity.version")) {
args("--ktest_logger=TEAMCITY") args("--ktest_logger=TEAMCITY")
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt
+1 -1
View File
@@ -57,7 +57,7 @@ open class KotlinNativeCompile : AbstractCompile() {
val libraries: FileCollection val libraries: FileCollection
@InputFiles get() = compilation.compileDependencyFiles @InputFiles get() = compilation.compileDependencyFiles
val friendModule: FileCollection? private val friendModule: FileCollection?
// It's already taken into account in libraries // It's already taken into account in libraries
@Internal get() = compilation.friendCompilation?.output @Internal get() = compilation.friendCompilation?.output