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

Fix home dir definition in some compiler tests

Browse Source
This commit is contained in:
Ilya Chernikov
2017-09-14 11:32:07 +02:00
parent 51fc3da2f5
commit 4eb4466314
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt
+1 -9
View File
@@ -16,12 +16,10 @@
package org.jetbrains.kotlin.checkers.javac
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTest
import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.PathUtil
import org.jetbrains.kotlin.test.KotlinTestUtils.getHomeDirectory
import java.io.File
abstract class AbstractDiagnosticsUsingJavacTest : AbstractDiagnosticsTest() {
@@ -46,10 +44,4 @@ abstract class AbstractDiagnosticsUsingJavacTest : AbstractDiagnosticsTest() {
environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
super.analyzeAndCheck(testDataFile, files)
}
private fun getHomeDirectory(): String {
val resourceRoot = PathUtil.getResourcePathForClass(KotlinTestUtils::class.java)
return FileUtil.toSystemIndependentName(resourceRoot.parentFile.parentFile.parent)
}
}
compiler/tests/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsTestWithStdLibUsingJavac.kt
+1 -9
View File
@@ -16,12 +16,10 @@
package org.jetbrains.kotlin.checkers.javac
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTestWithStdLib
import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.PathUtil
import org.jetbrains.kotlin.test.KotlinTestUtils.getHomeDirectory
import java.io.File
abstract class AbstractDiagnosticsTestWithStdLibUsingJavac : AbstractDiagnosticsTestWithStdLib() {
@@ -46,10 +44,4 @@ abstract class AbstractDiagnosticsTestWithStdLibUsingJavac : AbstractDiagnostics
environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
super.analyzeAndCheck(testDataFile, files)
}
private fun getHomeDirectory(): String {
val resourceRoot = PathUtil.getResourcePathForClass(KotlinTestUtils::class.java)
return FileUtil.toSystemIndependentName(resourceRoot.parentFile.parentFile.parent)
}
}