Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mbs 12612 Kotlin fallback fixes #1336

Merged
merged 2 commits into from
Feb 14, 2022
Merged

Mbs 12612 Kotlin fallback fixes #1336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c98122
MBS-12612 Add tests for Kotlin fallback detector
Feb 14, 2022
7abc532
MBS-12612 Fix log level
Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ...st/kotlin/com/avito/android/build_checks/kotlin_daemon/PreventKotlinDaemonFallbackTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@ internal class PreventKotlinDaemonFallbackTest {
.outputContains("Could not connect to kotlin daemon. Using fallback strategy.")
}

@Test
fun `disabled check without daemon strategy - no fallback strategy`() {
generateProject(enableCheck = false)
val result = build(":lib1:compileKotlin", "-Dkotlin.compiler.execution.strategy=in-process")

result.assertThat()
.buildSuccessful()
.outputDoesNotContain("Could not connect to kotlin daemon. Using fallback strategy.")
}

@Test
fun `single fallback - success`() {
generateProject(enableCheck = true)
Expand Down Expand Up @@ -68,11 +78,11 @@ internal class PreventKotlinDaemonFallbackTest {
}

private fun build(
task: String,
vararg args: String,
expectFailure: Boolean = false
) = gradlew(
projectDir,
task,
*args,
"-Dkotlin.daemon.jvm.options=invalid_jvm_argument_to_fail_process_startup",
"--rerun-tasks",
expectFailure = expectFailure
Expand Down
2 changes: 1 addition & 1 deletion ...lin/com/avito/android/build_checks/internal/kotlin_daemon/KotlinDaemonFallbackDetector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ internal class KotlinDaemonFallbackDetector {

fun register(project: Project) {
if (isDaemonDisabled(project)) {
project.logger.debug("Kotlin daemon fallback detection is disabled due to absence of daemon")
project.logger.lifecycle("Kotlin daemon fallback detection is disabled due to absence of daemon")
return
}
val fallbacksCounter = AtomicInteger(0)
Expand Down