Fix program inputs to library desugaring tests
This fixes missing class errors.
Change-Id: I2c62327fbd2e5558dee715ba14f1128a98a8674e
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/IterateTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/IterateTest.java
index 4ae0d62..b346e9e 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/IterateTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/IterateTest.java
@@ -82,7 +82,7 @@
private Collection<Path> getOtherProgramClasses() throws IOException {
Collection<Path> files = ToolHelper.getClassFilesForInnerClasses(getClass());
- files.removeIf(p -> p.toString().endsWith("Main.class"));
+ files.removeIf(p -> !p.toString().endsWith("StreamStub.class"));
return files;
}
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/SynchronizedCollectionTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/SynchronizedCollectionTest.java
index 3bff859..76aa711 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/SynchronizedCollectionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/SynchronizedCollectionTest.java
@@ -7,11 +7,13 @@
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.DEFAULT_SPECIFICATIONS;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.getJdk8Jdk11;
+import com.android.tools.r8.ArchiveProgramResourceProvider;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification;
import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification;
+import com.android.tools.r8.utils.DescriptorUtils;
import com.android.tools.r8.utils.StringUtils;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -58,7 +60,13 @@
@Test
public void testExecution() throws Throwable {
testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
- .addProgramFiles(INPUT_JAR)
+ .applyOnBuilder(
+ builder ->
+ builder.addProgramResourceProviders(
+ ArchiveProgramResourceProvider.fromArchive(
+ INPUT_JAR,
+ name ->
+ name.contains(DescriptorUtils.getBinaryNameFromJavaType(MAIN_CLASS)))))
.addKeepMainRule(MAIN_CLASS)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/FlowTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/FlowTest.java
index 3c5b5d5..25afd8c 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/FlowTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/FlowTest.java
@@ -30,7 +30,9 @@
private final LibraryDesugaringSpecification libraryDesugaringSpecification;
private final CompilationSpecification compilationSpecification;
- private static final Path INPUT_JAR = Paths.get(ToolHelper.EXAMPLES_JAVA9_BUILD_DIR + "flow.jar");
+ private static final Path FLOW_JAR = Paths.get(ToolHelper.EXAMPLES_JAVA9_BUILD_DIR + "flow.jar");
+ private static final Path FLOWLIB_JAR =
+ Paths.get(ToolHelper.EXAMPLES_JAVA9_BUILD_DIR + "flowlib.jar");
private static final String EXPECTED_OUTPUT = StringUtils.lines("true");
private static final String MAIN_CLASS = "flow.FlowExample";
@@ -58,7 +60,7 @@
@Test
public void test() throws Exception {
testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
- .addProgramFiles(INPUT_JAR)
+ .addProgramFiles(FLOW_JAR, FLOWLIB_JAR)
.addKeepMainRule(MAIN_CLASS)
.compile()
.withArt6Plus64BitsLib()
