diff options
| author | Jean-Philippe Lesot <jplesot@google.com> | 2014-09-15 09:03:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-15 09:03:18 +0000 |
| commit | 1d9c8b8cf69a05e31065d1cf662fb4495fd46d18 (patch) | |
| tree | 0be7e0c488d27a730fdb25d2345f09a6c2022fbc | |
| parent | 8a0bdadce907ccf7c652cf7aa31e882e61823bef (diff) | |
| parent | b7f82830c27c42f98ceca19b0e614f3e5cef200a (diff) | |
| download | toolchain_jill-1d9c8b8cf69a05e31065d1cf662fb4495fd46d18.zip toolchain_jill-1d9c8b8cf69a05e31065d1cf662fb4495fd46d18.tar.gz toolchain_jill-1d9c8b8cf69a05e31065d1cf662fb4495fd46d18.tar.bz2 | |
Merge "Fix Jill tests to handle changes made in Jack API" into ub-jack
| -rw-r--r-- | jill/tests/com/android/jill/JillTestTools.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jill/tests/com/android/jill/JillTestTools.java b/jill/tests/com/android/jill/JillTestTools.java index 5e603f5..205254b 100644 --- a/jill/tests/com/android/jill/JillTestTools.java +++ b/jill/tests/com/android/jill/JillTestTools.java @@ -21,6 +21,7 @@ import com.android.jack.JarJarRules; import com.android.jack.Options; import com.android.jack.ProguardFlags; import com.android.jack.TestTools; +import com.android.jack.backend.dex.DexFileWriter; import com.android.jack.util.ExecuteFile; import java.io.File; @@ -121,11 +122,11 @@ public class JillTestTools extends TestTools { runJill(refJar, jackFile); // Run Jack on .jack - File jackDex = new File(testDir, "testjack.dex"); - compileJackToDex(new Options(), jackFile, jackDex, false); + File jackDexFolder = TestTools.createTempDir("jack", "dex"); + compileJackToDex(new Options(), jackFile, jackDexFolder, false); // Compare Jack Dex file to reference new DexComparator(withDebugInfo, /* strict */false, /* compareDebugInfoBinary */ false, - /* compareInstructionNumber */ false, 0f).compare(refDex, jackDex); + /* compareInstructionNumber */ false, 0f).compare(refDex, new File(jackDexFolder, DexFileWriter.DEX_FILENAME)); } } |