gradle project: added jdk performance tests targetjb8u112-b540jb8u112-b539jb8u112-b538

2 files changed, 50 insertions, 14 deletions

diff --git a/idea/java/.idea/modules/java.iml b/idea/java/.idea/modules/java.iml
index 8f4fe4e..79cc3df 100644
--- a/idea/java/.idea/modules/java.iml
+++ b/idea/java/.idea/modules/java.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="java" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
     <exclude-output />
@@ -11,6 +11,9 @@
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
+    <content url="file://$MODULE_DIR$/../../../../jdk/idea">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/idea/java/tests/src" isTestSource="false" />
+    </content>
     <content url="file://$MODULE_DIR$/../../../../jdk/src/macosx">
       <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/src/macosx/classes" isTestSource="false" />
     </content>
diff --git a/idea/java/build.gradle b/idea/java/build.gradle
index fb185f2..08f7d33 100644
--- a/idea/java/build.gradle
+++ b/idea/java/build.gradle
@@ -1,35 +1,68 @@
 apply plugin: 'java'
 
+import org.gradle.internal.os.OperatingSystem
 import static java.lang.System.out
 import static java.lang.System.err
 
+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
+    } else if (OperatingSystem.current().isLinux()) {
+        file('../../build/linux-x86_64-normal-server-release/images/j2sdk-image/bin/java').absolutePath
+    } else {
+        'not implemented'
+    }
+}
+dependencies {
+    antClasspath 'ant-contrib:ant-contrib:20020829', 'org.apache.ant:ant-junit:1.8.1'
+}
 
+
+// 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
 sourceSets.main.java.srcDirs =
         ["../../jdk/src/share/classes",
          "../../jdk/src/macosx/classes",
          "../../jdk/src/windows/classes",
-         "../../jdk/src/solaris/classes"]
-
-
+         "../../jdk/src/solaris/classes",
+         "../../jdk/idea/java/tests/src"
+        ]
 
 def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile
-def makeCmd = "make -C " + buildDir + " COMPILER_WARNINGS_FATAL=false"
-def makeImagesCmd = makeCmd + " images"
-def makeCleanCmd = makeCmd + " clean"
-
 
 task make_images << {
-    def proc = makeImagesCmd.execute()
+    def pb = new ProcessBuilder().command("make", "-C", buildDir.absolutePath,
+            " COMPILER_WARNINGS_FATAL=false", "images")
+    def proc = pb.start()
     proc.consumeProcessOutput(out, err)
-    proc.waitFor()
-    assert proc.exitValue() == 0
+    assert proc.waitFor() == 0
 }
 
 task make_clean << {
-    def proc = makeCleanCmd.execute()
+    def pb = new ProcessBuilder().command("make", "-C", buildDir.absolutePath,
+            " COMPILER_WARNINGS_FATAL=false", "clean")
+    def proc = pb.start()
     proc.consumeProcessOutput(out, err)
-    proc.waitFor()
-    assert proc.exitValue() == 0
+    assert proc.waitFor() == 0
 }
 
 tasks.compileJava.enabled = false