commit be54ccd00f836d25d111f0e19372248bcf0550a9
author ager <ager@google.com> Wed Sep 20 07:21:28 2017 +0200
committer ager <ager@google.com> Wed Sep 20 07:21:28 2017 +0200
tree 932d166a32ec6ecf19c15ccbbbd9e41682f3b94d
parent 736f7eaae5f8e40127e83409dcd7469fbf55255f

Skip inlining test after disabling the inlining it is testing.

R=herhut@google.com

Bug: 65355452
Change-Id: I5337c4aa5647f35a2fadcc0583985f3ac87f0589

src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java b/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
index 66082fc..a1d8e2a 100644
--- a/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
@@ -60,6 +60,7 @@
   private static final List<Path> JAR_LIBRARIES = ListUtils.map(ImmutableList
       .of(ANDROID_JAR, ToolHelper.EXAMPLES_BUILD_DIR + "shakinglib.jar"), Paths::get);
   private static final String EMPTY_FLAGS = "src/test/proguard/valid/empty.flags";
+
   private static Set<String> IGNORED = ImmutableSet.of(
       // there's no point in running those without obfuscation
       "shaking1:keep-rules-repackaging.txt:DEX:false",
@@ -80,8 +81,11 @@
       "inlining:keep-rules-discard.txt:DEX:true",
       "inlining:keep-rules-discard.txt:JAR:true"
   );
-  private final boolean minify;
 
+  // TODO(65355452): Reenable or remove inlining tests.
+  private static Set<String> SKIPPED = ImmutableSet.of("inlining");
+
+  private final boolean minify;
 
   private enum Frontend {
     DEX, JAR
@@ -630,7 +634,6 @@
             "shaking15",
             "shaking16",
             "shaking17",
-            "inlining",
             "minification",
             "minifygeneric",
             "minifygenericwithinner",
@@ -817,6 +820,9 @@
       String keepName, List<String> keepList, Consumer<DexInspector> inspection,
       BiConsumer<String, String> outputComparator,
       BiConsumer<DexInspector, DexInspector> dexComparator) {
+    if (SKIPPED.contains(test)) {
+      return;
+    }
     addTestCase(testCases, test, Frontend.JAR, mainClass, keepName, keepList, false, inspection,
         outputComparator, dexComparator);
     addTestCase(testCases, test, Frontend.DEX, mainClass, keepName, keepList, false, inspection,