commit ec64aac9a36be52bd86ff92a92a99dc4c15f2687
author Søren Gjesse <sgjesse@google.com> Mon Oct 04 14:57:24 2021 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Oct 04 14:57:24 2021 +0200
tree 8017c710f6296cb4f4465f0b6dc477f961c029e1
parent f17be197b9416976f4802b98b8246d2677c77629

Update the JaCoCo test to not leave a jacoco.exec file

Change-Id: I26ec4e288e66bddfa5fdf1387455dc5826039397

src/test/java/com/android/tools/r8/JvmTestBuilder.java

diff --git a/src/test/java/com/android/tools/r8/JvmTestBuilder.java b/src/test/java/com/android/tools/r8/JvmTestBuilder.java
index f92a490..718cf4d 100644
--- a/src/test/java/com/android/tools/r8/JvmTestBuilder.java
+++ b/src/test/java/com/android/tools/r8/JvmTestBuilder.java
@@ -158,7 +158,8 @@
     return self();
   }
 
-  public JvmTestBuilder enableJaCoCoAgentForOfflineInstrumentedCode(Path jacocoAgent, Path output) {
+  public JvmTestBuilder configureJaCoCoAgentForOfflineInstrumentedCode(
+      Path jacocoAgent, Path output) {
     addProgramFiles(jacocoAgent);
     addVmArguments(
         "-Djacoco-agent.destfile=" + output.toString(),

src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicTest.java
index 86fad6d..266745e 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicTest.java
@@ -81,13 +81,6 @@
         .run(parameters.getRuntime(), MAIN_CLASS)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
 
-    // Run instrumented code without an agent.
-    testForRuntime(parameters)
-        .addProgramFiles(testClasses.getInstrumented())
-        .addProgramFiles(ToolHelper.JACOCO_AGENT)
-        .run(parameters.getRuntime(), MAIN_CLASS)
-        .assertSuccessWithOutput(EXPECTED_OUTPUT);
-
     // Run non-instrumented code with an agent causing on the fly instrumentation on the JVM.
     Path output = temp.newFolder().toPath();
     Path agentOutputOnTheFly = output.resolve("on-the-fly");
@@ -99,11 +92,11 @@
     List<String> onTheFlyReport = testClasses.generateReport(agentOutputOnTheFly);
     assertEquals(2, onTheFlyReport.size());
 
-    // Run the instrumented code with offline instrumentation turned on.
+    // Run the instrumented code.
     Path agentOutputOffline = output.resolve("offline");
     testForJvm()
         .addProgramFiles(testClasses.getInstrumented())
-        .enableJaCoCoAgentForOfflineInstrumentedCode(ToolHelper.JACOCO_AGENT, agentOutputOffline)
+        .configureJaCoCoAgentForOfflineInstrumentedCode(ToolHelper.JACOCO_AGENT, agentOutputOffline)
         .run(parameters.getRuntime(), MAIN_CLASS)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
     List<String> offlineReport = testClasses.generateReport(agentOutputOffline);