Add flag for dex verification

This commit is contained in:
Mikhael Bogdanov
2017-04-13 14:18:49 +02:00
parent df65b3f6b3
commit 3df32ad425
4 changed files with 17 additions and 1 deletions
@@ -52,6 +52,10 @@ abstract class AbstractLightAnalysisModeTest : CodegenTestCase() {
assertEquals(fullTxt, liteTxt)
}
override fun verifyWithDex(): Boolean {
return false
}
private fun compileWithLightAnalysis(wholeFile: File, files: List<CodegenTestCase.TestFile>, javaFilesDir: File?): String {
val boxTestsDir = File("compiler/testData/codegen/box")
val relativePath = wholeFile.toRelativeString(boxTestsDir)
@@ -401,7 +401,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
try {
classFileFactory = generateFiles(myEnvironment, myFiles, getClassBuilderFactory());
if (DxChecker.RUN_DX_CHECKER) {
if (verifyWithDex() && DxChecker.RUN_DX_CHECKER) {
DxChecker.check(classFileFactory);
}
}
@@ -427,6 +427,10 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
return classFileFactory;
}
protected boolean verifyWithDex() {
return true;
}
private static boolean verifyAllFilesWithAsm(ClassFileFactory factory, ClassLoader loader) {
boolean noErrors = true;
for (OutputFile file : ClassFileUtilsKt.getClassFiles(factory)) {
@@ -42,4 +42,8 @@ abstract class AbstractKapt3BuilderModeBytecodeShapeTest : CodegenTestCase() {
override fun getClassBuilderFactory(): ClassBuilderFactory {
return TEST_LIGHT_ANALYSIS
}
override fun verifyWithDex(): Boolean {
return false
}
}
@@ -27,4 +27,8 @@ abstract class AbstractBytecodeListingTestForSourceRetention : AbstractBytecodeL
else
ClassBuilderFactories.TEST
}
override fun verifyWithDex(): Boolean {
return false
}
}