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

Enable d8 by default

Browse Source
This commit is contained in:
Mikhail Bogdanov
2020-04-14 14:32:25 +02:00
parent dda2f53993
commit 4822d1e2ae
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/android-module/gradle.properties
+1 -1
View File
@@ -1,3 +1,3 @@
#don't try to download android specific tools within gradle: licence acceptance will be required #don't try to download android specific tools within gradle: licence acceptance will be required
android.builder.sdkDownload=false android.builder.sdkDownload=false
android.enableD8=false android.enableD8=true
compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt
+5 -5
View File
@@ -52,16 +52,16 @@ class CodegenTestsOnAndroidRunner private constructor(private val pathManager: P
try { try {
emulator.waitEmulatorStart() emulator.waitEmulatorStart()
runTestsOnEmulator(gradleRunner, TestSuite("Dex")).apply { runTestsOnEmulator(gradleRunner, TestSuite("D8")).apply {
rootSuite.addTest(this) rootSuite.addTest(this)
} }
renameFlavorFolder() renameFlavorFolder()
enableD8(true) enableD8(false)
runTestsOnEmulator(gradleRunner, TestSuite("D8")).apply { runTestsOnEmulator(gradleRunner, TestSuite("DX")).apply {
(0 until this.countTestCases()).forEach { (0 until this.countTestCases()).forEach {
val testCase = testAt(it) as TestCase val testCase = testAt(it) as TestCase
testCase.name += "_D8" testCase.name += "_DX"
} }
rootSuite.addTest(this) rootSuite.addTest(this)
} }
@@ -109,7 +109,7 @@ class CodegenTestsOnAndroidRunner private constructor(private val pathManager: P
private fun renameFlavorFolder() { private fun renameFlavorFolder() {
val reportFolder = File(flavorFolder()) 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" private fun flavorFolder() = pathManager.tmpFolder + "/build/test/results/connected/flavors"