diff options
-rw-r--r-- | jack-tests/tests/com/android/jack/shrob/ShrinkTests.java | 39 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/shrob/test043/refsShrinking/expected-001.txt | 8 |
2 files changed, 9 insertions, 38 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java index d5a0479..c73ecdb 100644 --- a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java @@ -28,7 +28,6 @@ import com.android.jack.test.toolchain.DummyToolchain; import com.android.jack.test.toolchain.JackApiToolchainBase; import com.android.jack.test.toolchain.JackBasedToolchain; import com.android.jack.util.TextUtils; -import com.android.sched.scheduler.ScheduleInstance; import org.junit.BeforeClass; import org.junit.Test; @@ -88,42 +87,6 @@ public class ShrinkTests extends AbstractTest { candidateNodeListing)); } - protected void runTestInMonoThreadWithOrderedInput( - @Nonnull String testNumber, - @Nonnull String flagNumber, - @Nonnull String mappingNumber) - throws Exception { - File testFolder = new File(shrobTestsDir, "test" + testNumber); - JackBasedToolchain toolchain = - AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - - File refFolder = new File(testFolder, "refsShrinking"); - - 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.addProperty(ScheduleInstance.DEFAULT_RUNNER.getName(), "single-threaded"); - toolchain.addProperty(Options.INPUT_FILTER.getName(), "ordered-filter"); - - File outFolder = AbstractTestTools.createTempDir(); - - SourceToDexComparisonTestHelper env = - new SourceToDexComparisonTestHelper(new File(testFolder, "jack")); - - env.setCandidateTestTools(toolchain); - env.setReferenceTestTools(new DummyToolchain()); - env.setProguardFlags( - dontObfuscateFlagFile, - new ProguardFlags(shrobTestsDir,"keepAllAttributes.flags"), - new ProguardFlags(testFolder, "proguard.flags" + flagNumber)); - - env.runTest(new ComparatorMapping(new File(refFolder, "expected-" + flagNumber + ".txt"), - candidateNodeListing)); - } - private void runTestWithLib(@Nonnull String testNumber, @Nonnull String flagNumber, boolean importLib) throws Exception { File testFolder = new File(shrobTestsDir, "test" + testNumber); @@ -328,7 +291,7 @@ public class ShrinkTests extends AbstractTest { @Test public void test43_001() throws Exception { - runTestInMonoThreadWithOrderedInput("043", "001", ""); + runTest("043", "001", ""); } @Test diff --git a/jack-tests/tests/com/android/jack/shrob/test043/refsShrinking/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test043/refsShrinking/expected-001.txt new file mode 100644 index 0000000..4365b76 --- /dev/null +++ b/jack-tests/tests/com/android/jack/shrob/test043/refsShrinking/expected-001.txt @@ -0,0 +1,8 @@ +Lcom/android/jack/shrob/test043/jack/I;: +getInt()I +Lcom/android/jack/shrob/test043/jack/B;: +<init>()V +getInt()I +Lcom/android/jack/shrob/test043/jack/A;: +<init>()V +test()V |