commit d5a88f30b6cde814a1e3817ee11b4be03d6c2b77
author Alexey Ushakov <Alexey.Ushakov@jetbrains.com> Thu Aug 31 08:45:56 2017 +0300
committer Alexey Ushakov <Alexey.Ushakov@jetbrains.com> Thu Aug 31 08:45:56 2017 +0300
tree 80c37210fdea5527c6f59e42f18219b6dd0285f5
parent bc3330a939ad6153597801300deca7fc3637c389

JRE-462 Migrate ant based junit tests to gradle

Added jbsdkhome property to run tests against arbitrary jdk

idea/java/build.gradle

diff --git a/idea/java/build.gradle b/idea/java/build.gradle
index c57717b..ee644f1 100644
--- a/idea/java/build.gradle
+++ b/idea/java/build.gradle
@@ -6,12 +6,16 @@
 }
 
 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
+    if (project.hasProperty('jbsdkhome')) {
+        jbsdkhome + (OperatingSystem.current().isWindows()?"/bin/java.exe" : "/bin/java")
     } else {
-        file('../../build/windows-x86_64-normal-server-release/images/j2sdk-image/bin/java.exe').absolutePath
+        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 {
+            file('../../build/windows-x86_64-normal-server-release/images/j2sdk-image/bin/java.exe').absolutePath
+        }
     }
 }