From 46db4b4e6df03843c14f1af6478d3a2c9057d0ea Mon Sep 17 00:00:00 2001 From: Mads Ager Date: Fri, 10 Mar 2023 12:48:31 +0100 Subject: [PATCH] [K2] Ignore failing metadata tests while working on them. --- .../org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt | 4 ++++ libraries/tools/kotlinp/testData/Annotations.kt | 2 ++ libraries/tools/kotlinp/testData/EnumEntries.kt | 1 + .../IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt | 2 ++ libraries/tools/kotlinp/testData/Lambda.kt | 2 ++ libraries/tools/kotlinp/testData/LocalDelegatedProperties.kt | 2 ++ libraries/tools/kotlinp/testData/NestedClasses.kt | 2 ++ libraries/tools/kotlinp/testData/OptionalAnnotation.kt | 1 + libraries/tools/kotlinp/testData/SimpleClass.kt | 2 ++ libraries/tools/kotlinp/testData/SimplePackage.kt | 2 ++ libraries/tools/kotlinp/testData/TypeParameters.kt | 2 ++ libraries/tools/kotlinp/testData/ValueClass.kt | 2 ++ libraries/tools/kotlinp/testData/VersionRequirement.kt | 2 ++ .../tools/kotlinp/testData/localClasses/AnonymousObject.kt | 2 ++ .../kotlinp/testData/localClasses/DeepInnerLocalChain.kt | 2 ++ .../kotlinp/testData/localClasses/LocalClassInConstructor.kt | 2 ++ 16 files changed, 32 insertions(+) diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt index a9a3d17b11b..ec438f87c50 100644 --- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt +++ b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt @@ -35,6 +35,10 @@ fun compileAndPrintAllFiles( readWriteAndCompare: Boolean, useK2: Boolean ) { + if (useK2 && InTextDirectivesUtils.findStringWithPrefixes(file.readText(), "// IGNORE K2") != null) { + return + } + val main = StringBuilder() val afterVisitors = StringBuilder() val afterNodes = StringBuilder() diff --git a/libraries/tools/kotlinp/testData/Annotations.kt b/libraries/tools/kotlinp/testData/Annotations.kt index 8e2e35df12e..3eba7ce7403 100644 --- a/libraries/tools/kotlinp/testData/Annotations.kt +++ b/libraries/tools/kotlinp/testData/Annotations.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + import kotlin.reflect.KClass @Target(AnnotationTarget.TYPE) diff --git a/libraries/tools/kotlinp/testData/EnumEntries.kt b/libraries/tools/kotlinp/testData/EnumEntries.kt index c5360ad877f..93f9bb370ae 100644 --- a/libraries/tools/kotlinp/testData/EnumEntries.kt +++ b/libraries/tools/kotlinp/testData/EnumEntries.kt @@ -1,3 +1,4 @@ +// IGNORE K2 // !LANGUAGE: +EnumEntries enum class MyEnum { diff --git a/libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt b/libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt index 90a2724f8d8..8de8b86a344 100644 --- a/libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt +++ b/libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + interface A interface B class Inv(e: T) diff --git a/libraries/tools/kotlinp/testData/Lambda.kt b/libraries/tools/kotlinp/testData/Lambda.kt index 988706a8b02..d6d576ad674 100644 --- a/libraries/tools/kotlinp/testData/Lambda.kt +++ b/libraries/tools/kotlinp/testData/Lambda.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + fun test() { val f = {} val g = fun Unit.(s: IntArray?, t: Set): String { return "" } diff --git a/libraries/tools/kotlinp/testData/LocalDelegatedProperties.kt b/libraries/tools/kotlinp/testData/LocalDelegatedProperties.kt index a9ceba7f87c..0fb47e706be 100644 --- a/libraries/tools/kotlinp/testData/LocalDelegatedProperties.kt +++ b/libraries/tools/kotlinp/testData/LocalDelegatedProperties.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + import kotlin.reflect.KProperty class Delegate(val value: T? = null) { diff --git a/libraries/tools/kotlinp/testData/NestedClasses.kt b/libraries/tools/kotlinp/testData/NestedClasses.kt index 5fce06eaa1b..10f8230d05b 100644 --- a/libraries/tools/kotlinp/testData/NestedClasses.kt +++ b/libraries/tools/kotlinp/testData/NestedClasses.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + interface A { interface B { interface C diff --git a/libraries/tools/kotlinp/testData/OptionalAnnotation.kt b/libraries/tools/kotlinp/testData/OptionalAnnotation.kt index 85fc91e7437..ff57868a6b6 100644 --- a/libraries/tools/kotlinp/testData/OptionalAnnotation.kt +++ b/libraries/tools/kotlinp/testData/OptionalAnnotation.kt @@ -1,3 +1,4 @@ +// IGNORE K2 // !LANGUAGE: +MultiPlatformProjects // !OPT_IN: kotlin.ExperimentalMultiplatform // NO_READ_WRITE_COMPARE diff --git a/libraries/tools/kotlinp/testData/SimpleClass.kt b/libraries/tools/kotlinp/testData/SimpleClass.kt index 057211d43ac..c1fb8032819 100644 --- a/libraries/tools/kotlinp/testData/SimpleClass.kt +++ b/libraries/tools/kotlinp/testData/SimpleClass.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + class SimpleClass(val p: Int = 42) { constructor(s: Array?) : this(s?.size ?: 0) diff --git a/libraries/tools/kotlinp/testData/SimplePackage.kt b/libraries/tools/kotlinp/testData/SimplePackage.kt index 9b4e4098fab..9bac8dbbde5 100644 --- a/libraries/tools/kotlinp/testData/SimplePackage.kt +++ b/libraries/tools/kotlinp/testData/SimplePackage.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + internal inline fun topLevelFun(x: X) = X::class var topLevelProp: String? = null diff --git a/libraries/tools/kotlinp/testData/TypeParameters.kt b/libraries/tools/kotlinp/testData/TypeParameters.kt index 233ab2e051e..d23095c7725 100644 --- a/libraries/tools/kotlinp/testData/TypeParameters.kt +++ b/libraries/tools/kotlinp/testData/TypeParameters.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + class A { fun a(t: T) {} diff --git a/libraries/tools/kotlinp/testData/ValueClass.kt b/libraries/tools/kotlinp/testData/ValueClass.kt index 086f58458fc..3fbfad6fea7 100644 --- a/libraries/tools/kotlinp/testData/ValueClass.kt +++ b/libraries/tools/kotlinp/testData/ValueClass.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + @JvmInline value class A(private val i: Int?) diff --git a/libraries/tools/kotlinp/testData/VersionRequirement.kt b/libraries/tools/kotlinp/testData/VersionRequirement.kt index 849eb85cb93..142ba9edc45 100644 --- a/libraries/tools/kotlinp/testData/VersionRequirement.kt +++ b/libraries/tools/kotlinp/testData/VersionRequirement.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") package test diff --git a/libraries/tools/kotlinp/testData/localClasses/AnonymousObject.kt b/libraries/tools/kotlinp/testData/localClasses/AnonymousObject.kt index 7cce458e02e..9f5d97ee25a 100644 --- a/libraries/tools/kotlinp/testData/localClasses/AnonymousObject.kt +++ b/libraries/tools/kotlinp/testData/localClasses/AnonymousObject.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + fun test() = object : Runnable { override fun run() { } } diff --git a/libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.kt b/libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.kt index 651e696c9c9..a4545c291e2 100644 --- a/libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.kt +++ b/libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + fun test() { class Local { inner class Inner { diff --git a/libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.kt b/libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.kt index 8ae3e83ee37..9ef022c1c41 100644 --- a/libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.kt +++ b/libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.kt @@ -1,3 +1,5 @@ +// IGNORE K2 + class A { init { class L {