diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 73857d7020e..3f4ffaddeaa 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -204,6 +204,7 @@ fun Project.projectTest( systemProperty("jps.kotlin.home", project.rootProject.extra["distKotlinHomeDir"]!!) systemProperty("kotlin.ni", if (project.rootProject.hasProperty("newInferenceTests")) "true" else "false") systemProperty("org.jetbrains.kotlin.skip.muted.tests", if (project.rootProject.hasProperty("skipMutedTests")) "true" else "false") + systemProperty("cacheRedirectorEnabled", project.rootProject.findProperty("cacheRedirectorEnabled")?.toString() ?: "false") project.kotlinBuildProperties.junit5NumberOfThreadsForParallelExecution?.let { n -> systemProperty("junit.jupiter.execution.parallel.config.strategy", "fixed") systemProperty("junit.jupiter.execution.parallel.config.fixed.parallelism", n) diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/ParcelizeMainClassProvider.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/ParcelizeMainClassProvider.kt index 97d7bda0108..714f2fa9cde 100644 --- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/ParcelizeMainClassProvider.kt +++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/ParcelizeMainClassProvider.kt @@ -12,7 +12,9 @@ import org.junit.runner.JUnitCore class ParcelizeMainClassProvider(testServices: TestServices) : JvmBoxMainClassProvider(testServices) { override fun getMainClassNameAndAdditionalArguments(): List { - return listOf( + return listOfNotNull( + "-Drobolectric.dependency.repo.url=https://cache-redirector.jetbrains.com/maven-central" + .takeIf { "true" == System.getProperty("cacheRedirectorEnabled") }, JUnitCore::class.java.name, JUNIT_GENERATED_TEST_CLASS_FQNAME )