From 1fa41719429b5c7e53194b882e58e28d6016feb6 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 14 Feb 2018 13:13:24 +0100 Subject: [PATCH] Enable all Java 9 tests Original commit: d2ed73eb782d39b4bf587c51d895ccb1069b8273 --- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 8c5e53b4b4c..7d1a42aa023 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -977,10 +977,10 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testJre9() { - val path = KotlinTestUtils.getJdk9HomeIfPossible()?.absolutePath ?: return + val jdk9Path = KotlinTestUtils.getJdk9Home().absolutePath - val jdk = myModel.global.addSdk(JDK_NAME, path, "9", JpsJavaSdkType.INSTANCE) - jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + path + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED) + val jdk = myModel.global.addSdk(JDK_NAME, jdk9Path, "9", JpsJavaSdkType.INSTANCE) + jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + jdk9Path + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED) loadProject(workDir.absolutePath + File.separator + PROJECT_NAME + ".ipr") addKotlinStdlibDependency()