Reorder arguments in KotlinNativeTest for better debug

Previously it was broken on Linux and worked poorly on macOS
This commit is contained in:
Kirill Shmakov
2020-09-10 11:24:50 +03:00
parent ef58e0cd71
commit 60b812f452
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
@@ -145,6 +145,9 @@ abstract class KotlinNativeTest : KotlinTest() {
testNegativeGradleFilter: Set<String>, testNegativeGradleFilter: Set<String>,
userArgs: List<String> userArgs: List<String>
): List<String> = mutableListOf<String>().also { ): List<String> = mutableListOf<String>().also {
// during debug from IDE executable is switched and special arguments are added
// via Gradle task manipulation; these arguments are expected to precede test settings
it.addAll(userArgs)
if (checkExitCode) { if (checkExitCode) {
// Avoid returning a non-zero exit code in case of failed tests. // Avoid returning a non-zero exit code in case of failed tests.
@@ -162,8 +165,6 @@ abstract class KotlinNativeTest : KotlinTest() {
if (testNegativeGradleFilter.isNotEmpty()) { if (testNegativeGradleFilter.isNotEmpty()) {
it.add("--ktest_negative_gradle_filter=${testNegativeGradleFilter.joinToString(",")}") it.add("--ktest_negative_gradle_filter=${testNegativeGradleFilter.joinToString(",")}")
} }
it.addAll(userArgs)
} }
} }
} }