commit 5230d8ff352ed61a67fae498f577b5cb1349b76c
author Clément Béra <clementbera@google.com> Tue Aug 15 09:46:24 2023 +0200
committer Clément Béra <clementbera@google.com> Tue Aug 15 08:34:06 2023 +0000
tree acd535aafc7a58a625ccbb6cce76acac4fb2b5ba
parent 3719de7e15570d83558c45fc04bcbf7ae615f11d

Jdk11NioTests should run with a different test dir

- remove dead withArtFrameworks code

Bug: b/290903900
Change-Id: I1d27f6928106de029538b8eed8b937a541698a9b

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

diff --git a/src/test/java/com/android/tools/r8/TestCompileResult.java b/src/test/java/com/android/tools/r8/TestCompileResult.java
index dfdfa9d..fda4235 100644
--- a/src/test/java/com/android/tools/r8/TestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/TestCompileResult.java
@@ -64,7 +64,6 @@
   final List<Path> additionalBootClasspath = new ArrayList<>();
   final List<String> vmArguments = new ArrayList<>();
   private boolean withArt6Plus64BitsLib = false;
-  private boolean withArtFrameworks = true;
   private LibraryDesugaringTestConfiguration libraryDesugaringTestConfiguration;
 
   TestCompileResult(TestState state, AndroidApp app, int minApiLevel, OutputMode outputMode) {
@@ -120,11 +119,6 @@
     return self();
   }
 
-  public final CR withArtFrameworks() {
-    withArtFrameworks = true;
-    return self();
-  }
-
   public final AndroidApp getApp() {
     return app;
   }
@@ -687,8 +681,7 @@
               }
             });
     ProcessResult result =
-        ToolHelper.runArtRaw(
-            classPath, mainClass, commandConsumer, vm, withArtFrameworks, arguments);
+        ToolHelper.runArtRaw(classPath, mainClass, commandConsumer, vm, true, arguments);
     return createRunResult(runtime, result);
   }
 

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java
index ed6b91a..36a79b4 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java
@@ -279,6 +279,7 @@
   @Test
   public void testNioFileDesugaredLib() throws Exception {
     String verbosity = "2";
+    Path testDir = temp.newFolder("jdknio").toPath();
     DesugaredLibraryTestCompileResult<?> compileResult =
         testForDesugaredLibrary(
                 parameters, libraryDesugaringSpecification, compilationSpecification)
@@ -287,6 +288,7 @@
             .addProgramFiles(testNGSupportProgramFiles())
             .addProgramClassFileData(getTestNGMainRunner())
             .compile()
+            .setSystemProperty("test.dir", testDir.toString())
             .withArt6Plus64BitsLib();
     int success = 0;
     List<String> failingClasses = new ArrayList<>();
@@ -338,6 +340,7 @@
         "The package java.nio was not present on older devices, all tests fail.",
         parameters.getDexRuntimeVersion().isOlderThan(Version.V8_1_0));
     String verbosity = "2";
+    Path testDir = temp.newFolder("jdknio").toPath();
     D8TestCompileResult compileResult =
         testForD8(parameters.getBackend())
             .addProgramFiles(TEST_UTIL_JAR)
@@ -346,6 +349,7 @@
             .addProgramClassFileData(getTestNGMainRunner())
             .addLibraryFiles(libraryDesugaringSpecification.getLibraryFiles())
             .compile()
+            .setSystemProperty("test.dir", testDir.toString())
             .withArt6Plus64BitsLib();
     for (String mainTestClass : SUCCESSFUL_MAIN_TESTS) {
       compileResult.run(parameters.getRuntime(), mainTestClass).assertSuccess();

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java
index 221a5c7..8db3b41 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java
@@ -182,4 +182,9 @@
     runnableCompiledResult.withArt6Plus64BitsLib();
     return this;
   }
+
+  public DesugaredLibraryTestCompileResult<T> setSystemProperty(String key, String value) {
+    runnableCompiledResult.setSystemProperty(key, value);
+    return this;
+  }
 }