From 534342a5662ac93a033f9fc613e474839d9a289f Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 4 Jan 2021 19:37:09 +0100 Subject: [PATCH] [minor] use new kotlin.io.path API in tests --- .../test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt index cfc0aa9c456..6fda4248334 100644 --- a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt +++ b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt @@ -113,7 +113,7 @@ fun runWithKotlincAndMainKts( scriptPath: String, expectedOutPatterns: List = emptyList(), expectedExitCode: Int = 0, - cacheDir: File? = null + cacheDir: Path? = null ) { val paths = PathUtil.kotlinPathsForDistDirectory runWithKotlinc( @@ -123,7 +123,7 @@ fun runWithKotlincAndMainKts( 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, expectedOutPatterns: List = emptyList(), 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( scriptPath, expectedOutPatterns, expectedExitCode, classpath = listOf(