From 0ba509dcd60d9764ee8b445725b28c933db1c90b Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Fri, 9 Feb 2024 18:20:37 +0100 Subject: [PATCH] [K/N][Tests] Adjust test signext_zeroext_interop.kt for different cache modes ^KT-61259 --- .../box/fileCheck/cinterop/signext_zeroext_interop.kt | 10 +++++++--- .../test/blackbox/support/runner/ResultHandler.kt | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/compiler/testData/codegen/box/fileCheck/cinterop/signext_zeroext_interop.kt b/compiler/testData/codegen/box/fileCheck/cinterop/signext_zeroext_interop.kt index b376538b177..dbeb67d9660 100644 --- a/compiler/testData/codegen/box/fileCheck/cinterop/signext_zeroext_interop.kt +++ b/compiler/testData/codegen/box/fileCheck/cinterop/signext_zeroext_interop.kt @@ -36,9 +36,9 @@ int callbackUser(int (*fn)(int, short)) { import signext_zeroext_interop_input.* import kotlinx.cinterop.* -// CHECK-DEFAULTABI: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16 zeroext){{.*}} -// CHECK-AAPCS: declare i1 @Kotlin_Char_isHighSurrogate(i16) -// CHECK-WINDOWSX64: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16) +// CHECK-DEFAULTABI-CACHE_NO: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16 zeroext){{.*}} +// CHECK-AAPCS-CACHE_NO: declare i1 @Kotlin_Char_isHighSurrogate(i16) +// CHECK-WINDOWSX64-CACHE_NO: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16) // Check that we pass attributes to functions imported from runtime. // CHECK-LABEL: void @"kfun:#checkRuntimeFunctionImport(){}"() @@ -89,6 +89,10 @@ fun box(): String { return "OK" } +// CHECK-DEFAULTABI-CACHE_STATIC_ONLY_DIST: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16 zeroext){{.*}} +// CHECK-AAPCS-CACHE_STATIC_ONLY_DIST: declare i1 @Kotlin_Char_isHighSurrogate(i16) +// CHECK-WINDOWSX64-CACHE_STATIC_ONLY_DIST: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16) + // CHECK-DEFAULTABI: signext i8 [[CHAR_ID_BRIDGE]](i8 signext %0) // CHECK-DEFAULTABI: [[CHAR_ID_PTR:%[0-9]+]] = load i8 (i8)*, i8 (i8)** @{{.*char_id}} // CHECK-DEFAULTABI: call signext i8 [[CHAR_ID_PTR]](i8 signext %0) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/ResultHandler.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/ResultHandler.kt index d898588e569..c601a9ea011 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/ResultHandler.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/ResultHandler.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.konan.test.blackbox.support.LoggedData import org.jetbrains.kotlin.konan.test.blackbox.support.TestName import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.ExecutionTimeout import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.ExitCode +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.CacheMode import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets import org.jetbrains.kotlin.konan.test.blackbox.support.settings.OptimizationMode import org.jetbrains.kotlin.konan.test.blackbox.support.settings.configurables @@ -110,7 +111,9 @@ internal class ResultHandler( } val optimizationMode = check.settings.get().name val checkPrefixesWithOptMode = checkPrefixes.map { "$it-$optimizationMode" } - val commaSeparatedCheckPrefixes = (checkPrefixes + checkPrefixesWithOptMode).joinToString(",") + val cacheMode = check.settings.get().alias + val checkPrefixesWithCacheMode = checkPrefixes.map { "$it-CACHE_$cacheMode" } + val commaSeparatedCheckPrefixes = (checkPrefixes + checkPrefixesWithOptMode + checkPrefixesWithCacheMode).joinToString(",") val result = ProcessBuilder( fileCheckExecutable,