commit 05e3617dd3a9b9c8e302c159b6aa816c34a04753
author Clément Béra <clementbera@google.com> Mon Jun 20 15:31:12 2022 +0200
committer Clément Béra <clementbera@google.com> Mon Jun 20 18:24:05 2022 +0000
tree 02eb2530196fed0eff0559a05add383737a3924d
parent a49a500d58a6283683d306fefebdf15e59196ef7

Fix temp file writing in root project directory

Change-Id: I9427ff93877916bdc69bc8512d993ce557634f49

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/ConcurrentHashMapFileSerializationTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/ConcurrentHashMapFileSerializationTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/ConcurrentHashMapFileSerializationTest.java
index 9a84bbc..1009f56 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/ConcurrentHashMapFileSerializationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/ConcurrentHashMapFileSerializationTest.java
@@ -76,7 +76,7 @@
         .run(
             parameters.getRuntime(),
             Executor.class,
-            uniqueName(libraryDesugaringSpecification, compilationSpecification, parameters))
+            uniqueName(temp, libraryDesugaringSpecification, compilationSpecification, parameters))
         .assertSuccessWithOutput(EXPECTED_RESULT);
   }
 

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestUtils.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestUtils.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestUtils.java
index 0103599..b07f7b9 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestUtils.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestUtils.java
@@ -6,8 +6,10 @@
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification;
 import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification;
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import org.junit.rules.TemporaryFolder;
 
 public abstract class GsonDesugaredLibraryTestUtils {
 
@@ -16,10 +18,13 @@
   static final Path GSON_2_8_1_JAR = Paths.get("third_party/iosched_2019/gson-2.8.1.jar");
 
   static String uniqueName(
+      TemporaryFolder temp,
       LibraryDesugaringSpecification libraryDesugaringSpecification,
       CompilationSpecification compilationSpecification,
-      TestParameters parameters) {
-    return "test_"
+      TestParameters parameters)
+      throws IOException {
+    return temp.newFolder("test_serialization").toString()
+        + "/test_"
         + libraryDesugaringSpecification.toString()
         + "_"
         + compilationSpecification.toString()

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/MyMapFileSerializationTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/MyMapFileSerializationTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/MyMapFileSerializationTest.java
index 1d54dcd..2387d64 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/MyMapFileSerializationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/MyMapFileSerializationTest.java
@@ -68,7 +68,7 @@
         .run(
             parameters.getRuntime(),
             Executor.class,
-            uniqueName(libraryDesugaringSpecification, compilationSpecification, parameters))
+            uniqueName(temp, libraryDesugaringSpecification, compilationSpecification, parameters))
         .assertSuccessWithOutput(EXPECTED_RESULT);
   }
 

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/TimeSerializationTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/TimeSerializationTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/TimeSerializationTest.java
index d044061..5c87fb9 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/TimeSerializationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/TimeSerializationTest.java
@@ -76,7 +76,7 @@
         .run(
             parameters.getRuntime(),
             Executor.class,
-            uniqueName(libraryDesugaringSpecification, compilationSpecification, parameters))
+            uniqueName(temp, libraryDesugaringSpecification, compilationSpecification, parameters))
         .assertSuccessWithOutput(EXPECTED_RESULT);
   }