azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stdlib test in compiler in the gradle environment

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class StdlibTest extends KotlinTestWithEnvironment {
@Override @Override
protected KotlinCoreEnvironment createEnvironment() { protected KotlinCoreEnvironment createEnvironment() {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
File[] runtimeClasspath = ForTestCompileRuntime.runtimeClassesForTests(); File[] runtimeClasspath = new File[] { ForTestCompileRuntime.runtimeJarForTests() };
CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_NO_RUNTIME, TestJdkKind.FULL_JDK, runtimeClasspath); CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_NO_RUNTIME, TestJdkKind.FULL_JDK, runtimeClasspath);
JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.kotlinTestJarForTests()); JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.kotlinTestJarForTests());
idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt
+1 -1
View File
@@ -67,7 +67,7 @@ class NoErrorsInStdlibTest : KotlinLightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor { override fun getProjectDescriptor(): LightProjectDescriptor {
// TODO: replace hardcoded path with something flexible // 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() override fun getSdk(): Sdk? = PluginTestCaseBase.fullJdk()
} }
} }