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

Attempt to fix Windows detection in main-kts tests

Browse Source
This commit is contained in:
Ilya Chernikov
2019-07-10 09:50:35 +02:00
parent 382e55284c
commit ab938efa68
1 changed files with 4 additions and 2 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 -2
View File
@@ -13,7 +13,7 @@ import java.io.InputStream
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.concurrent.thread import kotlin.concurrent.thread
class mainKtsIT { class MainKtsIT {
// TODO: partially copypasted from LauncherReplTest, consider extracting common parts to some (new) test util module // TODO: partially copypasted from LauncherReplTest, consider extracting common parts to some (new) test util module
private fun runWithKotlinc( private fun runWithKotlinc(
@@ -23,7 +23,9 @@ class mainKtsIT {
workDirectory: File? = null workDirectory: File? = null
) { ) {
val executableName = "kotlinc" val executableName = "kotlinc"
val executableFileName = if (System.getProperty("os.name").startsWith("windows")) "$executableName.bat" else executableName // TODO:
val executableFileName =
if (System.getProperty("os.name").contains("windows", ignoreCase = true)) "$executableName.bat" else executableName
val launcherFile = File("dist/kotlinc/bin/$executableFileName") val launcherFile = File("dist/kotlinc/bin/$executableFileName")
assertTrue("Launcher script not found, run dist task: ${launcherFile.absolutePath}", launcherFile.exists()) assertTrue("Launcher script not found, run dist task: ${launcherFile.absolutePath}", launcherFile.exists())