diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-04-27 09:36:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-27 09:36:23 +0000 |
| commit | 34b211ec9495c6adc84deed4c02703d0002dce3a (patch) | |
| tree | 6fbe4d81df76ba3233e5a413893d9b69efec68de /jack-tests | |
| parent | 6134b84110d17606c592c0a721d8510fecaad86b (diff) | |
| parent | 3b243cc9250fc84f2d761ab8bef2fdc99fb9fd1e (diff) | |
| download | toolchain_jack-34b211ec9495c6adc84deed4c02703d0002dce3a.tar.gz toolchain_jack-34b211ec9495c6adc84deed4c02703d0002dce3a.tar.bz2 toolchain_jack-34b211ec9495c6adc84deed4c02703d0002dce3a.zip | |
Merge "Add listing comparison to ShrinkTests.test21()" into ub-jack
Diffstat (limited to 'jack-tests')
| -rw-r--r-- | jack-tests/tests/com/android/jack/shrob/ShrinkTests.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java index 241a6f4a..eef337d0 100644 --- a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java @@ -150,12 +150,24 @@ public class ShrinkTests extends AbstractTest { new File(shrobTestsDir, "test021/jack")); toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + + File candidateNodeListing = AbstractTestTools.createTempFile("nodeListing", ".txt"); + toolchain.addProperty(ShrinkStructurePrinter.STRUCTURE_PRINTING.getName(), "true"); + toolchain.addProperty(ShrinkStructurePrinter.STRUCTURE_PRINTING_FILE.getName(), + candidateNodeListing.getPath()); + toolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods"); + toolchain.disableDxOptimizations(); + + toolchain.addProguardFlags( dontObfuscateFlagFile, new ProguardFlags(new File( shrobTestsDir, "test021"),"proguard.flags001")); shrinkOut = AbstractTestTools.createTempDir(); toolchain.libToLib(jackOut, shrinkOut, /* zipFiles = */ false); + new ComparatorMapping(candidateNodeListing, + new File(shrobTestsDir, "test021/refsShrinking/expected-001.txt")).compare(); + dexOut = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); toolchain.libToExe(shrinkOut, dexOut, /* zipFile = */ false); |