Revert "Generate and run art tests with new gradle"
This reverts commit ff4805a0f7f3e363b062dfca43ed8576d94f9e13.
Reason for revert: broke
Change-Id: I6236dc9d3f541bee6ffc36ced9f4cf81563c2e20
diff --git a/d8_r8/test_modules/tests_java_8/build.gradle.kts b/d8_r8/test_modules/tests_java_8/build.gradle.kts
index 1e42da1..aa3db57 100644
--- a/d8_r8/test_modules/tests_java_8/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/build.gradle.kts
@@ -17,8 +17,6 @@
sourceSets.test.configure {
java {
srcDir(root.resolveAll("src", "test", "java"))
- // Generated art tests
- srcDir(root.resolveAll("build", "generated", "test", "java"))
}
}
@@ -81,20 +79,10 @@
}
tasks {
- val createArtTests by registering(Exec::class) {
- val outputDir = getRoot().resolveAll("build", "generated", "test", "java", "com", "android", "tools", "r8", "art")
- val createArtTestsScript = getRoot().resolveAll("tools", "create_art_tests.py")
- inputs.file(createArtTestsScript)
- inputs.dir(getRoot().resolveAll("tests", "2017-10-04"))
- outputs.dir(outputDir)
- workingDir(getRoot())
- commandLine(createArtTestsScript)
- }
"compileTestJava" {
dependsOn(gradle.includedBuild("shared").task(":downloadDeps"))
}
withType<JavaCompile> {
- dependsOn(createArtTests)
dependsOn(gradle.includedBuild("keepanno").task(":jar"))
dependsOn(gradle.includedBuild("resourceshrinker").task(":jar"))
dependsOn(gradle.includedBuild("main").task(":compileJava"))