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

[minor] use new kotlin.io.path API in tests

Browse Source
This commit is contained in:
Ilya Chernikov
2021-01-04 19:37:09 +01:00
parent 1bd6cc823c
commit 534342a566
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt
+4 -4
View File
@@ -113,7 +113,7 @@ fun runWithKotlincAndMainKts(
scriptPath: String, scriptPath: String,
expectedOutPatterns: List<String> = emptyList(), expectedOutPatterns: List<String> = emptyList(),
expectedExitCode: Int = 0, expectedExitCode: Int = 0,
cacheDir: File? = null cacheDir: Path? = null
) { ) {
val paths = PathUtil.kotlinPathsForDistDirectory val paths = PathUtil.kotlinPathsForDistDirectory
runWithKotlinc( runWithKotlinc(
@@ -123,7 +123,7 @@ fun runWithKotlincAndMainKts(
Assert.assertTrue("kotlin-main-kts.jar not found, run dist task: ${it.absolutePath}", it.exists()) Assert.assertTrue("kotlin-main-kts.jar not found, run dist task: ${it.absolutePath}", it.exists())
} }
), ),
additionalEnvVars = listOf(COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR to (cacheDir?.absolutePath ?: "")) additionalEnvVars = listOf(COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR to (cacheDir?.toAbsolutePath()?.toString() ?: ""))
) )
} }
@@ -143,9 +143,9 @@ fun runWithK2JVMCompilerAndMainKts(
scriptPath: String, scriptPath: String,
expectedOutPatterns: List<String> = emptyList(), expectedOutPatterns: List<String> = emptyList(),
expectedExitCode: Int = 0, expectedExitCode: Int = 0,
cacheDir: File? = null cacheDir: Path? = null
) { ) {
withProperty(COMPILED_SCRIPTS_CACHE_DIR_PROPERTY, cacheDir?.absolutePath ?: "") { withProperty(COMPILED_SCRIPTS_CACHE_DIR_PROPERTY, cacheDir?.toAbsolutePath()?.toString() ?: "") {
runWithK2JVMCompiler( runWithK2JVMCompiler(
scriptPath, expectedOutPatterns, expectedExitCode, scriptPath, expectedOutPatterns, expectedExitCode,
classpath = listOf( classpath = listOf(