diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-09-19 06:41:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-19 06:41:16 +0000 |
| commit | 58a1dcc26203a77013637e999671b0114afc7b68 (patch) | |
| tree | 5b5e3abc756fffeece11618c9a489494c9bb8149 /jack | |
| parent | c64d28e4a19326cb4648deac09b162f7d4f9fd21 (diff) | |
| parent | 1e4a3ae6f86a8c50b0dc3f4b86d0595240a08e9a (diff) | |
| download | toolchain_jack-58a1dcc26203a77013637e999671b0114afc7b68.zip toolchain_jack-58a1dcc26203a77013637e999671b0114afc7b68.tar.gz toolchain_jack-58a1dcc26203a77013637e999671b0114afc7b68.tar.bz2 | |
Merge "Use DexAnnotationComparator as well in dex comparison tests" into ub-jack
Diffstat (limited to 'jack')
| -rw-r--r-- | jack/tests/com/android/jack/TestTools.java | 5 | ||||
| -rw-r--r-- | jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java index 48c6c55..360c7cf 100644 --- a/jack/tests/com/android/jack/TestTools.java +++ b/jack/tests/com/android/jack/TestTools.java @@ -872,9 +872,10 @@ public class TestTools { jarjarRules).dexFile; // Compare Jack Dex file to reference + File candidateFile = new File(jackDexFolder, DexFileWriter.DEX_FILENAME); new DexComparator(withDebugInfo, strict, false /* compareDebugInfoBinary */, - compareInstructionNumber, instructionNumberTolerance).compare(refDex, - new File(jackDexFolder, DexFileWriter.DEX_FILENAME)); + compareInstructionNumber, instructionNumberTolerance).compare(refDex, candidateFile); + new DexAnnotationsComparator().compare(refDex, candidateFile); } private static void unzip(@Nonnull File jarfile, @Nonnull File outputFolder) { diff --git a/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java b/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java index b809155..ef5a807 100644 --- a/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java +++ b/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java @@ -16,6 +16,7 @@ package com.android.jack.compile.androidtree.core; +import com.android.jack.DexAnnotationsComparator; import com.android.jack.DexComparator; import com.android.jack.JarJarRules; import com.android.jack.Options; @@ -83,5 +84,6 @@ public class CoreCompilationTest { new DexComparator(false /* withDebugInfo */, false /* strict */, false /* compareDebugInfoBinary */, true /* compareInstructionNumber */, 0).compare( coreDexFromJava, coreDexFromJack); + new DexAnnotationsComparator().compare(coreDexFromJava, coreDexFromJack); } } |