Fix test dependency
Change-Id: I0c74f17d81c8d13b25f10201f7190eace2c5af4a
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingJ$Test.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingJ$Test.java
index af6c9f9..8a1f22a 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingJ$Test.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingJ$Test.java
@@ -23,6 +23,7 @@
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.desugar.desugaredlibrary.jdktests.Jdk11TestLibraryDesugaringSpecification;
import com.android.tools.r8.errors.DuplicateTypesDiagnostic;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -119,6 +120,7 @@
private Path buildSplitDesugaredLibraryPart2() throws Exception {
Path outputDex = temp.newFolder().toPath().resolve("merger-input-split-dex.zip");
+ Jdk11TestLibraryDesugaringSpecification.setUp();
L8.run(
L8Command.builder()
.addLibraryFiles(getLibraryFile())
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11StreamAbstractTests.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11StreamAbstractTests.java
index fc7b65c..1d7e102 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11StreamAbstractTests.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11StreamAbstractTests.java
@@ -56,7 +56,7 @@
@Parameters(name = "{0}, spec: {1}, {2}")
public static List<Object[]> data() throws Exception {
- Jdk11TestLibraryDesugaringSpecification.setUpSpecifications();
+ Jdk11TestLibraryDesugaringSpecification.setUp();
return buildParameters(
// TODO(134732760): Support Dalvik VMs, currently fails because libjavacrypto is required
// and present only in ART runtimes.
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TestLibraryDesugaringSpecification.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TestLibraryDesugaringSpecification.java
index c108748..c208900 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TestLibraryDesugaringSpecification.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TestLibraryDesugaringSpecification.java
@@ -31,13 +31,14 @@
public class Jdk11TestLibraryDesugaringSpecification {
private static final String EXTENSION_STRING = "build/libs/java_base_extension.jar";
- public static final Path EXTENSION_PATH = Paths.get(EXTENSION_STRING);
private static Path[] JDK_11_JAVA_BASE_EXTENSION_COMPILED_FILES;
private static Path JDK_11_JAVA_BASE_EXTENSION_CLASSES_DIR;
private static final Path JDK_11_JAVA_BASE_EXTENSION_FILES_DIR =
Paths.get("third_party/openjdk/jdk-11-test/lib/testlibrary/bootlib/java.base");
+ public static Path EXTENSION_PATH;
+
public static LibraryDesugaringSpecification JDK8_JAVA_BASE_EXT;
public static LibraryDesugaringSpecification JDK11_JAVA_BASE_EXT;
public static LibraryDesugaringSpecification JDK11_PATH_JAVA_BASE_EXT;
@@ -49,7 +50,8 @@
return files;
}
- public static void setUpSpecifications() throws Exception {
+ public static void setUp() throws Exception {
+ EXTENSION_PATH = Paths.get(EXTENSION_STRING);
ensureJavaBaseExtensionsCompiled();
JDK8_JAVA_BASE_EXT = createSpecification("JDK8_JAVA_BASE_EXT", JDK8);
JDK11_JAVA_BASE_EXT = createSpecification("JDK11_JAVA_BASE_EXT", JDK11);
