commit 4a0f62c8b3e4a484f0fe929de7b8c58900c11585
author Christoffer Adamsen <christofferqa@google.com> Thu May 16 13:55:24 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Thu May 16 13:55:24 2024 +0200
tree a1bc1a4ad7fe709a4269ed91985cff5c51e427e1
parent 666d54cfd28e0978a3768cc03c02257cec833b81

Fix bootstrap determinism test

Change-Id: I0c4bea0e1e454d6935935955b455d42ba5ea4c9f

src/test/bootstrap/com/android/tools/r8/bootstrap/BootstrapDeterminismTest.java

diff --git a/src/test/bootstrap/com/android/tools/r8/bootstrap/BootstrapDeterminismTest.java b/src/test/bootstrap/com/android/tools/r8/bootstrap/BootstrapDeterminismTest.java
index 2d68578..a46b9f4 100644
--- a/src/test/bootstrap/com/android/tools/r8/bootstrap/BootstrapDeterminismTest.java
+++ b/src/test/bootstrap/com/android/tools/r8/bootstrap/BootstrapDeterminismTest.java
@@ -5,6 +5,7 @@
 
 import static org.junit.Assert.assertTrue;
 
+import com.android.tools.r8.ClassFileConsumer;
 import com.android.tools.r8.JdkClassFileProvider;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
@@ -48,7 +49,8 @@
 
   private Path compile(int iteration, Path logDirectory) throws Exception {
     System.out.println("= compiling " + iteration + "/" + ITERATIONS + " ======================");
-    return testForR8(parameters.getBackend())
+    Path out = temp.newFolder().toPath().resolve("out.jar");
+    testForR8(parameters.getBackend())
         .addProgramFiles(ToolHelper.getR8WithRelocatedDeps())
         .addLibraryProvider(JdkClassFileProvider.fromSystemJdk())
         .addKeepRuleFiles(MAIN_KEEP)
@@ -61,7 +63,8 @@
         .allowStdoutMessages()
         .allowStderrMessages()
         .allowUnusedDontWarnPatterns()
-        .compile()
-        .writeToZip();
+        .setProgramConsumer(new ClassFileConsumer.ArchiveConsumer(out))
+        .compile();
+    return out;
   }
 }