From be6722d44ad801fcfb9bd8929ebcafe568c6fcc6 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Thu, 21 Nov 2019 06:53:49 +0100 Subject: [PATCH] [build] workaround over bcabbcf3e155c0d41c3fb96b2156f3dd5709f26a --- performance/build.gradle | 12 +++++++----- settings.gradle | 28 +++++++++++++++------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/performance/build.gradle b/performance/build.gradle index a3feed1cc3e..4aee1d8123e 100644 --- a/performance/build.gradle +++ b/performance/build.gradle @@ -16,19 +16,19 @@ def rootBuildDirectory = rootProject.projectDir task konanRun { subprojects.each { - dependsOn it.getTasksByName('konanRun', true)[0] + dependsOn "${it.path}:konanRun" } } task jvmRun { subprojects.each { - dependsOn it.getTasksByName('jvmRun', true)[0] + dependsOn "${it.path}:jvmRun" } } task clean { subprojects.each { - dependsOn it.getTasksByName('clean', true)[0] + dependsOn "${it.path}:clean" } doLast { delete "${buildDir.absolutePath}" @@ -187,8 +187,10 @@ task mergeJvmReports { } subprojects.each { - it.getTasksByName('jvmJsonReport', true)[0].finalizedBy mergeJvmReports - it.getTasksByName('konanJsonReport', true)[0].finalizedBy mergeNativeReports + it.afterEvaluate { + it.jvmJsonReport.finalizedBy mergeJvmReports + it.konanJsonReport.finalizedBy mergeNativeReports + } } task teamCityStat(type:Exec) { diff --git a/settings.gradle b/settings.gradle index 860ba643b7a..09a5834d783 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,19 +31,21 @@ include ':backend.native:tests' include ':backend.native:debugger-tests' include ':utilities' -include ':performance' -include ':performance:ring' -include ':performance:cinterop' -include ':performance:helloworld' -include ':performance:numerical' -include ':performance:videoplayer' -include ':performance:framework' -if (System.getProperty("os.name") == "Mac OS X") { - include ':performance:objcinterop' - include ':performance:swiftinterop' - if (hasProperty("runExcludedBenchmarks")) { - include ':performance:KotlinVsSwift' - include ':performance:KotlinVsSwift:ring' +if (hasProperty("konan.home") || hasProperty("org.jetbrains.kotlin.native.home")) { + include ':performance' + include ':performance:ring' + include ':performance:cinterop' + include ':performance:helloworld' + include ':performance:numerical' + include ':performance:videoplayer' + include ':performance:framework' + if (System.getProperty("os.name") == "Mac OS X") { + include ':performance:objcinterop' + include ':performance:swiftinterop' + if (hasProperty("runExcludedBenchmarks")) { + include ':performance:KotlinVsSwift' + include ':performance:KotlinVsSwift:ring' + } } }