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

[K/JS] Fix Windows test run with a long test name

Browse Source
This commit is contained in:
Artem Kobzar
2023-03-16 16:48:53 +00:00
committed by Space Team
parent 37eefc2a05
commit 758b0ab457
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt
+11 -3
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.js.test.converters
import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
import org.jetbrains.kotlin.backend.common.phaser.toPhaseMap import org.jetbrains.kotlin.backend.common.phaser.toPhaseMap
import org.jetbrains.kotlin.backend.common.serialization.cityHash64
import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureDescriptor import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureDescriptor
import org.jetbrains.kotlin.cli.common.isWindows import org.jetbrains.kotlin.cli.common.isWindows
import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CommonConfigurationKeys
@@ -302,7 +303,8 @@ val TestModule.kind: ModuleKind
get() = directives.moduleKind get() = directives.moduleKind
fun String.augmentWithModuleName(moduleName: String): String { fun String.augmentWithModuleName(moduleName: String): String {
val normalizedName = moduleName.run { if (isWindows) minify() else this } val shouldMinimize = isWindows && moduleName.isPath()
val normalizedName = moduleName.run { if (shouldMinimize) minify() else this }
val suffix = when { val suffix = when {
endsWith(ESM_EXTENSION) -> ESM_EXTENSION endsWith(ESM_EXTENSION) -> ESM_EXTENSION
endsWith(REGULAR_EXTENSION) -> REGULAR_EXTENSION endsWith(REGULAR_EXTENSION) -> REGULAR_EXTENSION
@@ -320,8 +322,14 @@ fun String.augmentWithModuleName(moduleName: String): String {
// The hack should be deleted when D8 fixes the bug. // The hack should be deleted when D8 fixes the bug.
// The issue is here: https://bugs.chromium.org/p/v8/issues/detail?id=13318 // The issue is here: https://bugs.chromium.org/p/v8/issues/detail?id=13318
fun String.minify(): String { fun String.minify(): String {
return replace("kotlin_org_jetbrains_kotlin_kotlin_", "") if (length <= 80) return this
.replace("_minimal_for_test", "_min")
val directoryPath = substringBeforeLast('/')
val fileFullName = substringAfterLast('/')
val fileName = fileFullName.substringBeforeLast('.')
val fileExtension = fileFullName.substringAfterLast('.')
return "$directoryPath/${fileName.cityHash64().toULong().toString(16)}.$fileExtension"
} }
private fun String.isPath(): Boolean = contains("/") private fun String.isPath(): Boolean = contains("/")