Fix stdlib test in compiler in the gradle environment

This commit is contained in:
Ilya Chernikov
2017-09-15 17:24:30 +02:00
parent dfb0a47260
commit 5e108d8efd
2 changed files with 2 additions and 2 deletions
@@ -53,7 +53,7 @@ public class StdlibTest extends KotlinTestWithEnvironment {
@Override
protected KotlinCoreEnvironment createEnvironment() {
@SuppressWarnings("deprecation")
File[] runtimeClasspath = ForTestCompileRuntime.runtimeClassesForTests();
File[] runtimeClasspath = new File[] { ForTestCompileRuntime.runtimeJarForTests() };
CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_NO_RUNTIME, TestJdkKind.FULL_JDK, runtimeClasspath);
JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.kotlinTestJarForTests());
@@ -67,7 +67,7 @@ class NoErrorsInStdlibTest : KotlinLightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor {
// TODO: replace hardcoded path with something flexible
return object : KotlinJdkAndLibraryProjectDescriptor(File("build/kotlin-stdlib/classes/java/builtins")) {
return object : KotlinJdkAndLibraryProjectDescriptor(File("dist/kotlinc/lib/kotlin-stdlib.jar")) {
override fun getSdk(): Sdk? = PluginTestCaseBase.fullJdk()
}
}