JRE-462 Migrate ant based junit tests to gradle
Corrected gradle test task dependencies
diff --git a/idea/java/build.gradle b/idea/java/build.gradle
index edd1b6a..71e2501 100644
--- a/idea/java/build.gradle
+++ b/idea/java/build.gradle
@@ -1,15 +1,10 @@
apply plugin: 'java'
-
import org.gradle.internal.os.OperatingSystem
repositories {
mavenCentral()
}
-configurations {
- antClasspath
-}
-
def test_jvm = {
if (OperatingSystem.current().isMacOsX()) {
file('../../build/macosx-x86_64-normal-server-release/images/j2sdk-bundle/jdk1.8.0.jdk/Contents/Home/bin/java').absolutePath
@@ -29,20 +24,6 @@
}
-// add additional jars to the AntBuilder classpath for use within the imported build.
-ClassLoader antClassLoader = org.apache.tools.ant.Project.class.classLoader
-configurations.antClasspath.each { File f ->
- antClassLoader.addURL(f.toURI().toURL())
-}
-
-ant.importBuild('../../jdk/idea/java/tests/perf_tests.xml') { antTargetName ->
- 'jdk-perf-' + antTargetName
-}
-
-ant.properties.test_jvm = test_jvm()
-
-println ant.properties.test_jvm
-
if (OperatingSystem.current().isMacOsX())
sourceSets.main.java.srcDirs =
["../../jdk/src/share/classes",
@@ -59,12 +40,14 @@
"../../jdk/src/windows/classes",
]
-sourceSets.test.java.srcDirs = ["../../jdk/idea/java/tests/src", "../../jdk/test/jbu"]
+sourceSets.test.java.srcDirs = ["../../jdk/test/jbu"]
test.executable = test_jvm()
test {
systemProperty "testdata", file('../../jdk/test/jbu/testdata').absolutePath
+ outputs.upToDateWhen { false }
+ testLogging.showStandardStreams = true
}
def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile
@@ -96,3 +79,5 @@
classes.dependsOn.clear()
classes.dependsOn tasks.make_images, tasks.compileTestJava
tasks.cleanClasses.dependsOn tasks.make_clean
+test.dependsOn.clear()
+test.dependsOn tasks.compileTestJava
