diff --git a/build.gradle.kts b/build.gradle.kts index cc022e012ee..f0800206256 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,9 +54,7 @@ pill { } val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild -val includeStdlibJsIr by extra( - findProperty("include.stdlib.js.ir")?.let { it.toString().toBoolean() } ?: isTeamcityBuild -) +val includeStdlibJsIr by extra(project.kotlinBuildProperties.includeStdlibJsIr) val configuredJdks: List = getConfiguredJdks().also { @@ -327,7 +325,7 @@ fun Task.listConfigurationContents(configName: String) { val defaultJvmTarget = "1.8" val defaultJavaHome = jdkPath(defaultJvmTarget) -val ignoreTestFailures by extra(project.findProperty("ignoreTestFailures")?.toString()?.toBoolean() ?: project.hasProperty("teamcity")) +val ignoreTestFailures by extra(project.kotlinBuildProperties.ignoreTestFailures) allprojects { diff --git a/buildSrc/src/main/kotlin/BuildPropertiesExt.kt b/buildSrc/src/main/kotlin/BuildPropertiesExt.kt index 49a2dc60b5e..9fe0a600bb9 100644 --- a/buildSrc/src/main/kotlin/BuildPropertiesExt.kt +++ b/buildSrc/src/main/kotlin/BuildPropertiesExt.kt @@ -15,4 +15,8 @@ val KotlinBuildProperties.relocation: Boolean get() = postProcessing val KotlinBuildProperties.proguard: Boolean get() = postProcessing && getBoolean("kotlin.build.proguard", isTeamcityBuild) -val KotlinBuildProperties.jarCompression: Boolean get() = getBoolean("kotlin.build.jar.compression", isTeamcityBuild) \ No newline at end of file +val KotlinBuildProperties.jarCompression: Boolean get() = getBoolean("kotlin.build.jar.compression", isTeamcityBuild) + +val KotlinBuildProperties.ignoreTestFailures: Boolean get() = getBoolean("ignoreTestFailures", isTeamcityBuild) + +val KotlinBuildProperties.includeStdlibJsIr: Boolean get() = getBoolean("include.stdlib.js.ir", isTeamcityBuild) \ No newline at end of file diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 83c78e050a1..3ae967ac116 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -172,7 +172,7 @@ val runMocha by task { val target = if (project.hasProperty("teamcity")) "runOnTeamcity" else "test" setArgs(listOf("run", target)) - setIgnoreExitValue(rootProject.getBooleanProperty("ignoreTestFailures") ?: false) + setIgnoreExitValue(kotlinBuildProperties.ignoreTestFailures) dependsOn(npmInstall, "test") diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index a8f6b911534..d7b0dc48b7d 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -350,7 +350,7 @@ val runMocha by task { val allArgs = getArgs().toList() + listOf(testOutputFile/*, kotlinTestTestOutputFile*/) setArgs(allArgs) - setIgnoreExitValue(rootProject.getBooleanProperty("ignoreTestFailures") ?: false) + setIgnoreExitValue(kotlinBuildProperties.ignoreTestFailures) setWorkingDir(buildDir) }