commit 51ae3e4c86235ec3faa299474c79ceaeb582e97c
author Søren Gjesse <sgjesse@google.com> Wed May 24 08:23:32 2023 +0200
committer Søren Gjesse <sgjesse@google.com> Wed May 24 08:23:32 2023 +0200
tree 81cb37f0f850b5658eeaadad5dc13c9f3d285735
parent af7106f2db5cb4f66993cb8b4bdadc00c5936ef3

Try to fix Windows bot

Bug: b/282931297
Change-Id: I18d3986a908d2f4e1ec3211e306754d28a7265b8

src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java

diff --git a/src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java b/src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java
index d5edd80..48f8121 100644
--- a/src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java
+++ b/src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java
@@ -50,7 +50,7 @@
                 Integer.toString(parameters.getApiLevel().getLevel()),
                 "--lib",
                 ToolHelper.getAndroidJar(AndroidApiLevel.U).toAbsolutePath().toString(),
-                buildMultiReleaseJarWithUpperCaseMetaInf(workingDir).toString()));
+                buildMultiReleaseJarWithUpperCaseMetaInf(workingDir).toAbsolutePath().toString()));
     assertEquals(0, result.exitCode);
     runArtOnClassesDotDex(workingDir);
   }
@@ -64,8 +64,9 @@
         ToolHelper.getAndroidJar(AndroidApiLevel.U).toAbsolutePath().toString(),
         "--pg-conf",
         FileUtils.writeTextFile(temp.newFile("test.pro").toPath(), "-keep class * { *; }")
+            .toAbsolutePath()
             .toString(),
-        buildMultiReleaseJarWithUpperCaseMetaInf(workingDir).toString());
+        buildMultiReleaseJarWithUpperCaseMetaInf(workingDir).toAbsolutePath().toString());
     if (parameters.isCfRuntime()) {
       builder.add("--classfile");
     } else {

src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java

diff --git a/src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java b/src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java
index c215eba..4231616 100644
--- a/src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java
+++ b/src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java
@@ -50,7 +50,7 @@
                 Integer.toString(parameters.getApiLevel().getLevel()),
                 "--lib",
                 ToolHelper.getAndroidJar(AndroidApiLevel.U).toAbsolutePath().toString(),
-                buildZipWithUpperCaseExtension(workingDir).toString()));
+                buildZipWithUpperCaseExtension(workingDir).toAbsolutePath().toString()));
     assertEquals(0, result.exitCode);
     runArtOnClassesDotDex(workingDir);
   }
@@ -64,8 +64,9 @@
         ToolHelper.getAndroidJar(AndroidApiLevel.U).toAbsolutePath().toString(),
         "--pg-conf",
         FileUtils.writeTextFile(temp.newFile("test.pro").toPath(), "-keep class * { *; }")
+            .toAbsolutePath()
             .toString(),
-        buildZipWithUpperCaseExtension(workingDir).toString());
+        buildZipWithUpperCaseExtension(workingDir).toAbsolutePath().toString());
     if (parameters.isCfRuntime()) {
       builder.add("--classfile");
     } else {