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

[jps][tests] remove hardcoded dist path

Browse Source 
^KTIJ-20456
This commit is contained in:
Dmitry Gridin
2022-04-15 21:49:07 +07:00
parent 9c7fea24d1
commit e737015d5f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
+1 -2
View File
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.cli.common.CLICompiler
import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.js.K2JSCompiler import org.jetbrains.kotlin.cli.js.K2JSCompiler
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.jetbrains.kotlin.preloading.ClassPreloadingUtils import org.jetbrains.kotlin.preloading.ClassPreloadingUtils
import org.jetbrains.kotlin.preloading.Preloader import org.jetbrains.kotlin.preloading.Preloader
import org.jetbrains.kotlin.test.KtAssert.assertTrue import org.jetbrains.kotlin.test.KtAssert.assertTrue
@@ -110,7 +109,7 @@ object MockLibraryUtil {
val javaFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.java"), srcFile) val javaFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.java"), srcFile)
if (javaFiles.isNotEmpty()) { if (javaFiles.isNotEmpty()) {
val classpath = mutableListOf<String>() val classpath = mutableListOf<String>()
classpath += ForTestCompileRuntime.runtimeJarForTests().path classpath += PathUtil.kotlinPathsForDistDirectoryForTests.stdlibPath.path
classpath += extraClasspath classpath += extraClasspath
// Probably no kotlin files were present, so dir might not have been created after kotlin compiler // Probably no kotlin files were present, so dir might not have been created after kotlin compiler
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+1 -3
View File
@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.jetbrains.kotlin.compilerRunner.* import org.jetbrains.kotlin.compilerRunner.*
import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.incremental.components.LookupInfo import org.jetbrains.kotlin.incremental.components.LookupInfo
@@ -37,7 +36,6 @@ import org.jetbrains.kotlin.test.kotlinPathsForDistDirectoryForTests
import org.jetbrains.kotlin.utils.JsMetadataVersion import org.jetbrains.kotlin.utils.JsMetadataVersion
import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil
import java.io.* import java.io.*
import java.util.*
abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() { abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() {
@@ -76,7 +74,7 @@ abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() {
sourcesToCompile = filesToCompile.toList(), sourcesToCompile = filesToCompile.toList(),
commonSources = emptyList(), commonSources = emptyList(),
javaSourceRoots = listOf(JvmSourceRoot(srcDir, null)), javaSourceRoots = listOf(JvmSourceRoot(srcDir, null)),
classpath = listOf(outDir, ForTestCompileRuntime.runtimeJarForTests()).filter { it.exists() }, classpath = listOf(outDir, PathUtil.kotlinPathsForDistDirectoryForTests.stdlibPath).filter { it.exists() },
friendDirs = emptyList() friendDirs = emptyList()
) )