[Native][tests] Rename Gradle task "externalTest" to "codegenBoxTest"

This commit is contained in:
Dmitriy Dolovov
2022-02-09 15:45:07 +03:00
parent e5f819ffad
commit 174f4cd220
6 changed files with 569 additions and 569 deletions
+1 -1
View File
@@ -150,7 +150,7 @@ fun nativeTest(taskName: String, vararg tags: String) = projectTest(taskName, jU
// Tasks that run different sorts of tests. Most frequent use case: running specific tests at TeamCity.
val infrastructureTest = nativeTest("infrastructureTest", "infrastructure")
val externalTest = nativeTest("externalTest", "external")
val codegenBoxTest = nativeTest("codegenBoxTest", "codegen")
val klibAbiTest = nativeTest("klibAbiTest", "klib")
// "test" task is created by convention. We can't just remove it. Let's enable it in developer's environment, so it can be used
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.generators.tests
import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
import org.jetbrains.kotlin.generators.model.annotation
import org.jetbrains.kotlin.konan.blackboxtest.AbstractExternalNativeBlackBoxTest
import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeCodegenBoxTest
import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeBlackBoxTest
import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeKlibABITest
import org.jetbrains.kotlin.konan.blackboxtest.support.ClassLevelProperty
@@ -22,11 +22,11 @@ fun main() {
System.setProperty("java.awt.headless", "true")
generateTestGroupSuiteWithJUnit5 {
// External box tests.
// Codegen box tests.
testGroup("native/native.tests/tests-gen", "compiler/testData") {
testClass<AbstractExternalNativeBlackBoxTest>(
suiteTestClassName = "ExternalTestGenerated",
annotations = listOf(external(), provider<UseExtTestCaseGroupProvider>())
testClass<AbstractNativeCodegenBoxTest>(
suiteTestClassName = "NativeCodegenBoxTestGenerated",
annotations = listOf(codegen(), provider<UseExtTestCaseGroupProvider>())
) {
model("codegen/box", targetBackend = TargetBackend.NATIVE)
model("codegen/boxInline", targetBackend = TargetBackend.NATIVE)
@@ -64,7 +64,7 @@ fun main() {
private inline fun <reified T : Annotation> provider() = annotation(T::class.java)
private fun external() = annotation(Tag::class.java, "external")
private fun codegen() = annotation(Tag::class.java, "codegen")
private fun infrastructure() = annotation(Tag::class.java, "infrastructure")
private fun enforcedCacheMode(alias: CacheMode.Alias) = annotation(
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.util.ThreadSafeCache
import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile
import java.io.File
abstract class AbstractExternalNativeBlackBoxTest : ExternalSourceTransformersProvider, AbstractNativeBlackBoxTest() {
abstract class AbstractNativeCodegenBoxTest : ExternalSourceTransformersProvider, AbstractNativeBlackBoxTest() {
private val registeredSourceTransformers: ThreadSafeCache<File, MutableList<ExternalSourceTransformer>> = ThreadSafeCache()
override fun getSourceTransformers(testDataFile: File): ExternalSourceTransformers? = registeredSourceTransformers[testDataFile]
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.group.PredefinedTestCases
import org.junit.jupiter.api.Tag
import org.junit.jupiter.api.TestFactory
@Tag("external")
@Tag("codegen")
@PredefinedTestCases(
TC(
name = "nativeStdlib",
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.konan.blackboxtest.support.util
import org.jetbrains.kotlin.konan.blackboxtest.AbstractExternalNativeBlackBoxTest
import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeCodegenBoxTest
/**
* This relates only to external codegen tests (see [AbstractExternalNativeBlackBoxTest]) that may have their own source transformers.
* This relates only to external codegen tests (see [AbstractNativeCodegenBoxTest]) that may have their own source transformers.
*/
internal typealias ExternalSourceTransformer = (/* file contents */ String) -> /* patched file contents */ String