Enable bootstrap tests running with r8lib
As discussed earlier we could also move these out to test_module
specific invocations, but we need some additional infrastructure for
that.
Bug: b/337801526
Change-Id: I2ef77667f17d40657368227003da2478d0929f15
diff --git a/d8_r8/test/build.gradle.kts b/d8_r8/test/build.gradle.kts
index 1e7ac2b..dbf9725 100644
--- a/d8_r8/test/build.gradle.kts
+++ b/d8_r8/test/build.gradle.kts
@@ -29,6 +29,7 @@
val javaTestBaseDepsJar = projectTask("testbase", "depsJar")
val java8TestJarTask = projectTask("tests_java_8", "testJar")
val bootstrapTestsDepsJarTask = projectTask("tests_bootstrap", "depsJar")
+val bootstrapTestJarTask = projectTask("tests_bootstrap", "testJar")
val testsJava8SourceSetDependenciesTask = projectTask("tests_java_8", "sourceSetDependencyTask")
tasks {
@@ -57,7 +58,9 @@
val packageTests by registering(Jar::class) {
dependsOn(java8TestJarTask)
+ dependsOn(bootstrapTestJarTask)
from(java8TestJarTask.outputs.files.map(::zipTree))
+ from(bootstrapTestJarTask.outputs.files.map(::zipTree))
exclude("META-INF/*.kotlin_module", "**/*.kotlin_metadata")
destinationDirectory.set(getRoot().resolveAll("build", "libs"))
archiveFileName.set("r8tests.jar")
@@ -395,6 +398,7 @@
packageTestDeps,
r8Lib,
r8WithRelocatedDepsTask,
+ assembleR8LibNoDeps,
testsJava8SourceSetDependenciesTask,
rewriteTestBaseForR8LibWithRelocatedDeps,
unzipRewrittenTests,
@@ -428,6 +432,7 @@
systemProperty("BUILD_PROP_R8_RUNTIME_PATH", r8LibJar)
systemProperty("R8_DEPS", mainDepsJarTask.getSingleOutputFile())
systemProperty("com.android.tools.r8.artprofilerewritingcompletenesscheck", "true")
+ systemProperty("R8_WITH_RELOCATED_DEPS", r8WithRelocatedDepsTask.outputs.files.singleFile)
reports.junitXml.outputLocation.set(getRoot().resolveAll("build", "test-results", "test"))
reports.html.outputLocation.set(getRoot().resolveAll("build", "reports", "tests", "test"))
