From 4822d1e2ae6e94375df94493ab31434293a66944 Mon Sep 17 00:00:00 2001 From: Mikhail Bogdanov Date: Tue, 14 Apr 2020 14:32:25 +0200 Subject: [PATCH] Enable d8 by default --- .../android-tests/android-module/gradle.properties | 2 +- .../android/tests/CodegenTestsOnAndroidRunner.kt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/android-tests/android-module/gradle.properties b/compiler/android-tests/android-module/gradle.properties index 56e25b9919c..b5cbc3bf649 100644 --- a/compiler/android-tests/android-module/gradle.properties +++ b/compiler/android-tests/android-module/gradle.properties @@ -1,3 +1,3 @@ #don't try to download android specific tools within gradle: licence acceptance will be required android.builder.sdkDownload=false -android.enableD8=false \ No newline at end of file +android.enableD8=true \ No newline at end of file diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt index a756070555f..8504b6514fa 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt @@ -52,16 +52,16 @@ class CodegenTestsOnAndroidRunner private constructor(private val pathManager: P try { emulator.waitEmulatorStart() - runTestsOnEmulator(gradleRunner, TestSuite("Dex")).apply { + runTestsOnEmulator(gradleRunner, TestSuite("D8")).apply { rootSuite.addTest(this) } renameFlavorFolder() - enableD8(true) - runTestsOnEmulator(gradleRunner, TestSuite("D8")).apply { + enableD8(false) + runTestsOnEmulator(gradleRunner, TestSuite("DX")).apply { (0 until this.countTestCases()).forEach { val testCase = testAt(it) as TestCase - testCase.name += "_D8" + testCase.name += "_DX" } rootSuite.addTest(this) } @@ -109,7 +109,7 @@ class CodegenTestsOnAndroidRunner private constructor(private val pathManager: P private fun renameFlavorFolder() { val reportFolder = File(flavorFolder()) - reportFolder.renameTo(File(reportFolder.parentFile, reportFolder.name + "_dex")) + reportFolder.renameTo(File(reportFolder.parentFile, reportFolder.name + "_d8")) } private fun flavorFolder() = pathManager.tmpFolder + "/build/test/results/connected/flavors"