Add listing comparison to ShrinkTests.test21()

Reference listing was used for ShrinkTests.test21_001()
but not for this extra test which splits compilation
into 3 steps.

Bug: 20151065
Change-Id: I1aedfd4bfc19162b0ffe7f972379ba272addab6b

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);