commit 937afad14b7cbac81ef1798d30d708204b957b8f
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Apr 08 19:59:32 2019 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Apr 08 19:59:32 2019 +0200
tree 36c85019c121860a0ea160082df2440bca233181
parent cfff4680c54ced9d40776c404f97fbcde4f490b4

Ignore failing test on DEX-7.0.0

Bug: 130164528
Change-Id: Ie501b6b7ac0d27393a3af11015f379a37b7190a7

src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java

diff --git a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
index 6daef42..3983ee9 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
@@ -8,14 +8,15 @@
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import com.android.tools.r8.CompilationFailedException;
 import com.android.tools.r8.DataEntryResource;
 import com.android.tools.r8.NeverInline;
-import com.android.tools.r8.R8TestRunResult;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.origin.Origin;
 import com.android.tools.r8.utils.StringUtils;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
@@ -127,31 +128,30 @@
   @Test
   public void testRewritings() throws IOException, CompilationFailedException, ExecutionException {
     Path path = temp.newFile("out.zip").toPath();
-    R8TestRunResult inspect =
-        testForR8(parameters.getBackend())
-            .addInnerClasses(ServiceLoaderRewritingTest.class)
-            .addKeepMainRule(MainRunner.class)
-            .setMinApi(parameters.getRuntime())
-            .addDataEntryResources(
-                DataEntryResource.fromBytes(
-                    StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
-                    "META-INF/services/" + Service.class.getTypeName(),
-                    Origin.unknown()))
-            .compile()
-            .writeToZip(path)
-            .run(parameters.getRuntime(), MainRunner.class)
-            .assertSuccessWithOutput(EXPECTED_OUTPUT)
-            .inspect(
-                inspector -> {
-                  // Check that we have actually rewritten the calls to ServiceLoader.load.
-                  ClassSubject clazz = inspector.clazz(MainRunner.class);
-                  assertTrue(clazz.isPresent());
-                  MethodSubject main = clazz.uniqueMethodWithName("main");
-                  assertTrue(main.isPresent());
-                  assertTrue(
-                      main.streamInstructions()
-                          .noneMatch(ServiceLoaderRewritingTest::isServiceLoaderLoad));
-                });
+    testForR8(parameters.getBackend())
+        .addInnerClasses(ServiceLoaderRewritingTest.class)
+        .addKeepMainRule(MainRunner.class)
+        .setMinApi(parameters.getRuntime())
+        .addDataEntryResources(
+            DataEntryResource.fromBytes(
+                StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
+                "META-INF/services/" + Service.class.getTypeName(),
+                Origin.unknown()))
+        .compile()
+        .writeToZip(path)
+        .run(parameters.getRuntime(), MainRunner.class)
+        .assertSuccessWithOutput(EXPECTED_OUTPUT)
+        .inspect(
+            inspector -> {
+              // Check that we have actually rewritten the calls to ServiceLoader.load.
+              ClassSubject clazz = inspector.clazz(MainRunner.class);
+              assertTrue(clazz.isPresent());
+              MethodSubject main = clazz.uniqueMethodWithName("main");
+              assertTrue(main.isPresent());
+              assertTrue(
+                  main.streamInstructions()
+                      .noneMatch(ServiceLoaderRewritingTest::isServiceLoaderLoad));
+            });
 
     // Check that we have removed the service configuration from META-INF/services.
     ZipFile zip = new ZipFile(path.toFile());
@@ -239,6 +239,10 @@
   @Test
   public void testKeepAsOriginal()
       throws IOException, CompilationFailedException, ExecutionException {
+    // TODO(b/130164528)
+    assumeTrue(
+        parameters.getRuntime().isCf()
+            || !parameters.getRuntime().asDex().getVm().getVersion().equals(Version.V7_0_0));
     Path path = temp.newFile("out.zip").toPath();
     CodeInspector inspector =
         testForR8(parameters.getBackend())