commit 10965b2ac1f6744f196c1146b676d15b72549c82
author Stephan Herhut <herhut@google.com> Tue May 23 10:15:24 2017 +0200
committer Stephan Herhut <herhut@google.com> Tue May 23 10:15:24 2017 +0200
tree 247c886b313a6b205f156dca5846d9250e933653
parent b462c6ed314fbf3f80e6c63b1d8853365033563a

Enable class merging for class merging tests.

BUG=

Change-Id: Idfe1b328e39ac1222fdabe2423670a8d6479ccd6

src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java
index 2326eb5..0d0d6f0 100644
--- a/src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java
@@ -35,7 +35,10 @@
             .addProgramFiles(EXAMPLE_JAR)
             .addProguardConfigurationFiles(EXAMPLE_KEEP)
             .setMinification(false)
-            .build(), o -> o.allowAccessModification = false);
+            .build(), o -> {
+          o.allowAccessModification = false;
+          o.skipClassMerging = false;
+        });
     inspector = new DexInspector(
         Paths.get(temp.getRoot().getCanonicalPath()).resolve("classes.dex"));
   }