diff --git a/compiler/testData/diagnostics/nativeTests/nativeProtectedFunCall.fir.kt b/compiler/testData/diagnostics/nativeTests/nativeProtectedFunCall.fir.kt index 8c641172e63..806e076589c 100644 --- a/compiler/testData/diagnostics/nativeTests/nativeProtectedFunCall.fir.kt +++ b/compiler/testData/diagnostics/nativeTests/nativeProtectedFunCall.fir.kt @@ -12,7 +12,7 @@ open class ProtectedInsideInlineError : ProtectedInsideInlineParent() { protected fun protectedFun() = 0 inline fun publicInlineUserFun() { - println(protectedVar + protectedParentVar) + println(protectedVar + protectedParentVar) protectedFun() protectedParentFun() } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt index c358c8e0b50..6fc91672ba5 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.config.AnalysisFlags.allowFullyQualifiedNameInKClass import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfigurationKey import org.jetbrains.kotlin.config.LanguageVersion -import org.jetbrains.kotlin.platform.CommonPlatforms +import org.jetbrains.kotlin.platform.isCommon import org.jetbrains.kotlin.test.directives.ConfigurationDirectives import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB import org.jetbrains.kotlin.test.directives.model.DirectivesContainer @@ -43,13 +43,11 @@ class CommonEnvironmentConfigurator(testServices: TestServices) : EnvironmentCon configuration.put(key as CompilerConfigurationKey, value) } - if (module.targetPlatform in CommonPlatforms.allDefaultTargetPlatforms) { - if (WITH_STDLIB in module.directives) { - configuration.add( - CLIConfigurationKeys.CONTENT_ROOTS, - JvmClasspathRoot(ForTestCompileRuntime.stdlibCommonForTests()) - ) - } + if (module.targetPlatform.isCommon() && WITH_STDLIB in module.directives) { + configuration.add( + CLIConfigurationKeys.CONTENT_ROOTS, + JvmClasspathRoot(ForTestCompileRuntime.stdlibCommonForTests()) + ) } } } diff --git a/native/dignostic-tests/build.gradle.kts b/native/dignostic-tests/build.gradle.kts deleted file mode 100644 index 07fe1deb0e2..00000000000 --- a/native/dignostic-tests/build.gradle.kts +++ /dev/null @@ -1,34 +0,0 @@ -plugins { - kotlin("jvm") -} - -dependencies { - testImplementation(projectTests(":compiler:tests-common-new")) - testImplementation(projectTests(":generators:test-generator")) - testImplementation(project(":native:kotlin-native-utils")) - testApiJUnit5() -} - -val generationRoot = projectDir.resolve("tests-gen") - -sourceSets { - "main" { none() } - "test" { - projectDefault() - java.srcDirs(generationRoot.name) - } -} - -val testTags = findProperty("kotlin.native.tests.tags")?.toString() -// Note: arbitrary JUnit tag expressions can be used in this property. -// See https://junit.org/junit5/docs/current/user-guide/#running-tests-tag-expressions -val test by nativeTest("test", testTags).apply { - configure { - dependsOn(":dist") - } -} - -val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateNativeDiagnosticTestsKt") { - javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_11_0)) - dependsOn(":compiler:generateTestData") -} diff --git a/native/dignostic-tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeDiagnosticTests.kt b/native/dignostic-tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeDiagnosticTests.kt deleted file mode 100644 index 067602414c0..00000000000 --- a/native/dignostic-tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeDiagnosticTests.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.generators.tests - -import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 -import org.jetbrains.kotlin.konan.diagnostics.AbstractDiagnosticsNativeTest -import org.jetbrains.kotlin.konan.diagnostics.AbstractFirLightTreeNativeDiagnosticsTest -import org.jetbrains.kotlin.konan.diagnostics.AbstractFirPsiNativeDiagnosticsTest -import org.jetbrains.kotlin.test.utils.CUSTOM_TEST_DATA_EXTENSION_PATTERN - -fun main() { - System.setProperty("java.awt.headless", "true") - val excludedCustomTestdataPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN - - generateTestGroupSuiteWithJUnit5 { - // New frontend test infrastructure tests - testGroup(testsRoot = "native/dignostic-tests/tests-gen", testDataRoot = "compiler/testData") { - testClass { - model("diagnostics/nativeTests", excludedPattern = excludedCustomTestdataPattern) - } - - testClass( - suiteTestClassName = "FirPsiOldFrontendNativeDiagnosticsTestGenerated", - ) { - model("diagnostics/nativeTests", excludedPattern = excludedCustomTestdataPattern) - } - - testClass( - suiteTestClassName = "FirLightTreeOldFrontendNativeDiagnosticsTestGenerated", - ) { - model("diagnostics/nativeTests", excludedPattern = excludedCustomTestdataPattern) - } - } - } -} diff --git a/native/dignostic-tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java similarity index 98% rename from native/dignostic-tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java index 9e2ecf44d6a..525993b691c 100644 --- a/native/dignostic-tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeDiagnosticTestsKt}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/nativeTests") @TestDataPath("$PROJECT_ROOT") diff --git a/native/dignostic-tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java similarity index 94% rename from native/dignostic-tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java index e47739636e5..fc38ac9b5d3 100644 --- a/native/dignostic-tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.konan.diagnostics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.junit.jupiter.api.Tag; +import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -14,10 +16,12 @@ import org.junit.jupiter.api.Test; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeDiagnosticTestsKt}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/nativeTests") @TestDataPath("$PROJECT_ROOT") +@Tag("frontend-fir") +@FirPipeline() public class FirLightTreeOldFrontendNativeDiagnosticsTestGenerated extends AbstractFirLightTreeNativeDiagnosticsTest { @Test public void testAllFilesPresentInNativeTests() throws Exception { diff --git a/native/dignostic-tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java similarity index 94% rename from native/dignostic-tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java index daf5dc9939c..d0286ddbeed 100644 --- a/native/dignostic-tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.konan.diagnostics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.junit.jupiter.api.Tag; +import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -14,10 +16,12 @@ import org.junit.jupiter.api.Test; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeDiagnosticTestsKt}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/nativeTests") @TestDataPath("$PROJECT_ROOT") +@Tag("frontend-fir") +@FirPipeline() public class FirPsiOldFrontendNativeDiagnosticsTestGenerated extends AbstractFirPsiNativeDiagnosticsTest { @Test public void testAllFilesPresentInNativeTests() throws Exception { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt index fc8faafd741..cefd90c3cf4 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt @@ -17,7 +17,11 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.group.* import org.jetbrains.kotlin.konan.blackboxtest.support.group.DisabledTestsIfProperty import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage +import org.jetbrains.kotlin.konan.diagnostics.AbstractDiagnosticsNativeTest +import org.jetbrains.kotlin.konan.diagnostics.AbstractFirLightTreeNativeDiagnosticsTest +import org.jetbrains.kotlin.konan.diagnostics.AbstractFirPsiNativeDiagnosticsTest import org.jetbrains.kotlin.test.TargetBackend +import org.jetbrains.kotlin.test.utils.CUSTOM_TEST_DATA_EXTENSION_PATTERN import org.junit.jupiter.api.Tag fun main() { @@ -216,6 +220,27 @@ fun main() { model("lldb") } } + + // New frontend test infrastructure tests + testGroup(testsRoot = "native/native.tests/tests-gen", testDataRoot = "compiler/testData") { + testClass { + model("diagnostics/nativeTests", excludedPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN) + } + + testClass( + suiteTestClassName = "FirPsiOldFrontendNativeDiagnosticsTestGenerated", + annotations = listOf(*frontendFir()), + ) { + model("diagnostics/nativeTests", excludedPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN) + } + + testClass( + suiteTestClassName = "FirLightTreeOldFrontendNativeDiagnosticsTestGenerated", + annotations = listOf(*frontendFir()), + ) { + model("diagnostics/nativeTests", excludedPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN) + } + } } } diff --git a/native/dignostic-tests/tests/org/jetbrains/kotlin/konan/diagnostics/AbstractDiagnosticsNativeTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/diagnostics/AbstractDiagnosticsNativeTest.kt similarity index 100% rename from native/dignostic-tests/tests/org/jetbrains/kotlin/konan/diagnostics/AbstractDiagnosticsNativeTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/diagnostics/AbstractDiagnosticsNativeTest.kt diff --git a/settings.gradle b/settings.gradle index c25eeab48f4..8f8294e7df9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -99,7 +99,6 @@ include ":benchmarks", ":js:js.dce", ":js:js.tests", ":native:kotlin-native-utils", - ":native:dignostic-tests", ":native:frontend.native", ":native:kotlin-klib-commonizer", ":native:kotlin-klib-commonizer-api",