Add flag for dex verification
This commit is contained in:
@@ -52,6 +52,10 @@ abstract class AbstractLightAnalysisModeTest : CodegenTestCase() {
|
|||||||
assertEquals(fullTxt, liteTxt)
|
assertEquals(fullTxt, liteTxt)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun verifyWithDex(): Boolean {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
private fun compileWithLightAnalysis(wholeFile: File, files: List<CodegenTestCase.TestFile>, javaFilesDir: File?): String {
|
private fun compileWithLightAnalysis(wholeFile: File, files: List<CodegenTestCase.TestFile>, javaFilesDir: File?): String {
|
||||||
val boxTestsDir = File("compiler/testData/codegen/box")
|
val boxTestsDir = File("compiler/testData/codegen/box")
|
||||||
val relativePath = wholeFile.toRelativeString(boxTestsDir)
|
val relativePath = wholeFile.toRelativeString(boxTestsDir)
|
||||||
|
|||||||
@@ -401,7 +401,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
|
|||||||
try {
|
try {
|
||||||
classFileFactory = generateFiles(myEnvironment, myFiles, getClassBuilderFactory());
|
classFileFactory = generateFiles(myEnvironment, myFiles, getClassBuilderFactory());
|
||||||
|
|
||||||
if (DxChecker.RUN_DX_CHECKER) {
|
if (verifyWithDex() && DxChecker.RUN_DX_CHECKER) {
|
||||||
DxChecker.check(classFileFactory);
|
DxChecker.check(classFileFactory);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -427,6 +427,10 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
|
|||||||
return classFileFactory;
|
return classFileFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected boolean verifyWithDex() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
private static boolean verifyAllFilesWithAsm(ClassFileFactory factory, ClassLoader loader) {
|
private static boolean verifyAllFilesWithAsm(ClassFileFactory factory, ClassLoader loader) {
|
||||||
boolean noErrors = true;
|
boolean noErrors = true;
|
||||||
for (OutputFile file : ClassFileUtilsKt.getClassFiles(factory)) {
|
for (OutputFile file : ClassFileUtilsKt.getClassFiles(factory)) {
|
||||||
|
|||||||
+4
@@ -42,4 +42,8 @@ abstract class AbstractKapt3BuilderModeBytecodeShapeTest : CodegenTestCase() {
|
|||||||
override fun getClassBuilderFactory(): ClassBuilderFactory {
|
override fun getClassBuilderFactory(): ClassBuilderFactory {
|
||||||
return TEST_LIGHT_ANALYSIS
|
return TEST_LIGHT_ANALYSIS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun verifyWithDex(): Boolean {
|
||||||
|
return false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+4
@@ -27,4 +27,8 @@ abstract class AbstractBytecodeListingTestForSourceRetention : AbstractBytecodeL
|
|||||||
else
|
else
|
||||||
ClassBuilderFactories.TEST
|
ClassBuilderFactories.TEST
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun verifyWithDex(): Boolean {
|
||||||
|
return false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user