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

[Native][tests] Allow overriding test properties via Gradle properties

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-11-13 16:50:55 +03:00
parent a029b50755
commit 61b8fb8fc2
3 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/NativeBlackBoxTestSupport.kt
+4 -1
View File
@@ -27,8 +27,11 @@ class NativeBlackBoxTestSupport : BeforeEachCallback {
* Also, [TestInstancePostProcessor.postProcessTestInstance] allows accessing only the currently created test instance and does
* not allow accessing its parent test instance in case there are inner test classes in the generated test suite.
*/
override fun beforeEach(extensionContext: ExtensionContext) = with(extensionContext) {
override fun beforeEach(extensionContext: ExtensionContext): Unit = with(extensionContext) {
enclosingTestInstance.testRunProvider = getOrCreateTestRunProvider()
// Set the essential compiler property.
System.setProperty("kotlin.native.home", getOrCreateGlobalEnvironment().kotlinNativeHome.path)
}
companion object {
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestEnvironment.kt
+10 -11
View File
@@ -38,22 +38,22 @@ internal class GlobalTestEnvironment(
// Use isolated cached class loader.
private val defaultKotlinNativeClassLoader: Lazy<ClassLoader> = lazy {
val nativeClassPath = System.getProperty(KOTLIN_NATIVE_CLASSPATH)
val nativeClassPath = System.getProperty(COMPILER_CLASSPATH)
?.split(':', ';')
?.map { File(it).toURI().toURL() }
?.toTypedArray()
?: fail { "Non-specified $KOTLIN_NATIVE_CLASSPATH system property" }
?: fail { "Non-specified $COMPILER_CLASSPATH system property" }
URLClassLoader(nativeClassPath, /* no parent class loader */ null).apply { setDefaultAssertionStatus(true) }
}
private val defaultTestMode: TestMode = run {
val testModeName = System.getProperty(KOTLIN_NATIVE_TEST_MODE) ?: return@run TestMode.WITH_MODULES
val testModeName = System.getProperty(TEST_MODE) ?: return@run TestMode.WITH_MODULES
TestMode.values().firstOrNull { it.name == testModeName } ?: fail {
buildString {
appendLine("Unknown test mode name $testModeName.")
appendLine("One of the following test modes should be passed through $KOTLIN_NATIVE_TEST_MODE system property:")
appendLine("One of the following test modes should be passed through $TEST_MODE system property:")
TestMode.values().forEach { testMode ->
appendLine("- ${testMode.name}: ${testMode.description}")
}
@@ -62,10 +62,9 @@ internal class GlobalTestEnvironment(
}
private val defaultCacheSettings: TestCacheSettings = run {
val useCacheValue = System.getProperty(KOTLIN_NATIVE_TEST_USE_CACHE)
val useCacheValue = System.getProperty(USE_CACHE)
val useCache = if (useCacheValue != null) {
useCacheValue.toBooleanStrictOrNull()
?: fail { "Invalid value for $KOTLIN_NATIVE_TEST_USE_CACHE system property: $useCacheValue" }
useCacheValue.toBooleanStrictOrNull() ?: fail { "Invalid value for $USE_CACHE system property: $useCacheValue" }
} else
true
@@ -75,10 +74,10 @@ internal class GlobalTestEnvironment(
private val projectBuildDir: File
get() = System.getenv(PROJECT_BUILD_DIR)?.let(::File) ?: fail { "Non-specified $PROJECT_BUILD_DIR environment variable" }
private const val KOTLIN_NATIVE_HOME = "kotlin.native.home"
private const val KOTLIN_NATIVE_CLASSPATH = "kotlin.internal.native.classpath"
private const val KOTLIN_NATIVE_TEST_MODE = "kotlin.internal.native.test.mode"
private const val KOTLIN_NATIVE_TEST_USE_CACHE = "kotlin.internal.native.test.useCache"
private const val KOTLIN_NATIVE_HOME = "kotlin.internal.native.test.nativeHome"
private const val COMPILER_CLASSPATH = "kotlin.internal.native.test.compilerClasspath"
private const val TEST_MODE = "kotlin.internal.native.test.mode"
private const val USE_CACHE = "kotlin.internal.native.test.useCache"
private const val PROJECT_BUILD_DIR = "PROJECT_BUILD_DIR"
}
}