diff options
| author | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2017-08-31 08:45:56 +0300 |
|---|---|---|
| committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2017-08-31 08:45:56 +0300 |
| commit | d5a88f30b6cde814a1e3817ee11b4be03d6c2b77 (patch) | |
| tree | 80c37210fdea5527c6f59e42f18219b6dd0285f5 | |
| parent | bc3330a939ad6153597801300deca7fc3637c389 (diff) | |
| download | jdk8u-d5a88f30b6cde814a1e3817ee11b4be03d6c2b77.tar.gz | |
JRE-462 Migrate ant based junit tests to gradlejb8u152-b984
Added jbsdkhome property to run tests against arbitrary jdk
| -rw-r--r-- | idea/java/build.gradle | 14 |
1 files changed, 9 insertions, 5 deletions
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 @@ repositories { } 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 + } } } |