From bd7cd3807b18423bebde9aa0f754c2f25e339720 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Thu, 17 Sep 2020 20:07:13 +0300 Subject: [PATCH] Support 'expectedExitStatus' for framework tests --- .../src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt index 991c6b3b4d1..088f071b4ae 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt @@ -6,6 +6,7 @@ import org.gradle.api.DefaultTask import org.gradle.api.Task import org.gradle.api.file.FileTree import org.gradle.api.tasks.Input +import org.gradle.api.tasks.Optional import org.gradle.api.tasks.TaskAction import org.gradle.language.base.plugins.LifecycleBasePlugin @@ -40,6 +41,9 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable { val testOutput: String = project.testOutputFramework + @Input @Optional + var expectedExitStatus: Int? = null + /** * Framework description. * @@ -229,7 +233,7 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable { |stdout: $stdOut |stderr: $stdErr """.trimMargin()) - check(exitCode == 0) { "Execution of $testExecName failed with exit code: $exitCode " } + check(exitCode == expectedExitStatus ?: 0) { "Execution of $testExecName failed with exit code: $exitCode " } } private fun validateBitcodeEmbedding(frameworkBinary: String) {