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

Test runner: Add a flag to ignore failures in the exit code

Browse Source 
Kotlin/Native test runner sets the exit code to a non-zero value
if there are failing tests. This patch adds a flag allowing a user
to disable this feature and make the runner to always return 0.
Note the exit code is still returned using the `exitProcess` call.
This commit is contained in:
Ilya Matveev
2019-04-10 12:17:54 +07:00
committed by Ilya Matveev
parent 6c39516380
commit 43c6452575
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/kotlin/kotlin/native/internal/test/TestRunner.kt
+10 -5
View File
@@ -15,6 +15,7 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
private val listeners = mutableSetOf<TestListener>() private val listeners = mutableSetOf<TestListener>()
private var logger: TestLogger = GTestLogger() private var logger: TestLogger = GTestLogger()
private var runTests = true private var runTests = true
private var useExitCode = true
var iterations = 1 var iterations = 1
private set private set
var exitCode = 0 var exitCode = 0
@@ -35,6 +36,7 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
"--help" -> { "--help" -> {
logger.log(help); runTests = false logger.log(help); runTests = false
} }
"--ktest_no_exit_code" -> useExitCode = false
else -> throw IllegalArgumentException("Unknown option: $it\n$help") else -> throw IllegalArgumentException("Unknown option: $it\n$help")
} }
2 -> { 2 -> {
@@ -50,9 +52,7 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
"--ktest_negative_gradle_filter" -> setGradleFilterFromArg(value, false) "--ktest_negative_gradle_filter" -> setGradleFilterFromArg(value, false)
"--ktest_repeat", "--ktest_repeat",
"--gtest_repeat" -> iterations = value.toIntOrNull() ?: throw IllegalArgumentException("Cannot parse number: $value") "--gtest_repeat" -> iterations = value.toIntOrNull() ?: throw IllegalArgumentException("Cannot parse number: $value")
else -> if (key.startsWith("--ktest_")) { else -> throw IllegalArgumentException("Unknown option: $it\n$help")
throw IllegalArgumentException("Unknown option: $it\n$help")
}
} }
} }
else -> throw IllegalArgumentException("Unknown option: $it\n$help") else -> throw IllegalArgumentException("Unknown option: $it\n$help")
@@ -101,6 +101,8 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
* Use a negative count to repeat forever. * Use a negative count to repeat forever.
* *
* --ktest_logger=GTEST|TEAMCITY|SIMPLE|SILENT - Use the specified output format. The default one is GTEST. * --ktest_logger=GTEST|TEAMCITY|SIMPLE|SILENT - Use the specified output format. The default one is GTEST.
*
* --ktest_no_exit_code - Don't return a non-zero exit code if there are failing tests.
*/ */
private fun String.substringEscaped(range: IntRange) = private fun String.substringEscaped(range: IntRange) =
@@ -213,6 +215,8 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
| Use a negative count to repeat forever. | Use a negative count to repeat forever.
| |
|--ktest_logger=GTEST|TEAMCITY|SIMPLE|SILENT - Use the specified output format. The default one is GTEST. |--ktest_logger=GTEST|TEAMCITY|SIMPLE|SILENT - Use the specified output format. The default one is GTEST.
|
|--ktest_no_exit_code - Don't return a non-zero exit code if there are failing tests.
""".trimMargin() """.trimMargin()
private inline fun sendToListeners(event: TestListener.() -> Unit) { private inline fun sendToListeners(event: TestListener.() -> Unit) {
@@ -233,7 +237,9 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
sendToListeners { pass(testCase, getTimeMillis() - startTime) } sendToListeners { pass(testCase, getTimeMillis() - startTime) }
} catch (e: Throwable) { } catch (e: Throwable) {
sendToListeners { fail(testCase, e, getTimeMillis() - startTime) } sendToListeners { fail(testCase, e, getTimeMillis() - startTime) }
exitCode = 1 if (useExitCode) {
exitCode = 1
}
} }
} }
} }
@@ -270,6 +276,5 @@ internal class TestRunner(val suites: List<TestSuite>, args: Array<String>) {
} }
sendToListeners { finishTesting(this@TestRunner, totalTime) } sendToListeners { finishTesting(this@TestRunner, totalTime) }
return exitCode return exitCode
} }
} }