From e5906a8a3a3b01066bd080316d3083057676ce3a Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 15 Sep 2023 16:05:34 +0200 Subject: [PATCH] LV 2.0: remove CLI tests covering quite obsolete legacy --- ...internalArgumentOverrideExtraArgument.args | 5 ----- .../internalArgumentOverrideExtraArgument.out | 10 ---------- ...wInferenceImpliesProgressiveModeForNI.args | 3 --- ...newInferenceImpliesProgressiveModeForNI.kt | 11 ---------- ...ewInferenceImpliesProgressiveModeForNI.out | 1 - .../newInferenceImpliesSamConversions.args | 3 --- .../jvm/newInferenceImpliesSamConversions.kt | 2 +- .../jvm/newInferenceImpliesSamConversions.out | 1 - ...renceWithOldFlagImpliesSamConversions.args | 4 ---- ...erenceWithOldFlagImpliesSamConversions.out | 1 - .../kotlin/cli/CliTestGenerated.java | 20 ------------------- 11 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.args delete mode 100644 compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.out delete mode 100644 compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.args delete mode 100644 compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt delete mode 100644 compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.out delete mode 100644 compiler/testData/cli/jvm/newInferenceImpliesSamConversions.args delete mode 100644 compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out delete mode 100644 compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.args delete mode 100644 compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out diff --git a/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.args b/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.args deleted file mode 100644 index b1d825c2f97..00000000000 --- a/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.args +++ /dev/null @@ -1,5 +0,0 @@ -$TESTDATA_DIR$/legacySmartCastsAfterTry.kt --d -$TEMP_DIR$ --XXLanguage\:+SoundSmartCastsAfterTry --Xlegacy-smart-cast-after-try diff --git a/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.out b/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.out deleted file mode 100644 index 1f3a36d07e5..00000000000 --- a/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.out +++ /dev/null @@ -1,10 +0,0 @@ -warning: ATTENTION! -This build uses unsafe internal compiler arguments: - --XXLanguage:+SoundSmartCastsAfterTry - -This mode is not recommended for production use, -as no stability/compatibility guarantees are given on -compiler or generated code. Use it at your own risk! - -OK diff --git a/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.args b/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.args deleted file mode 100644 index cbe67944f06..00000000000 --- a/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.args +++ /dev/null @@ -1,3 +0,0 @@ -$TESTDATA_DIR$/newInferenceImpliesProgressiveModeForNI.kt --d -$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt b/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt deleted file mode 100644 index 50c59914756..00000000000 --- a/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt +++ /dev/null @@ -1,11 +0,0 @@ -fun bar(): Int = 0 - -object Scope { - fun foo(f: () -> T): T = f() - - fun bar(x: Int = 0): String = "" - - fun test() { - val r1 = foo(::bar) - } -} \ No newline at end of file diff --git a/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.out b/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.args b/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.args deleted file mode 100644 index e7e7b204d28..00000000000 --- a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.args +++ /dev/null @@ -1,3 +0,0 @@ -$TESTDATA_DIR$/newInferenceImpliesSamConversions.kt --d -$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt b/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt index d06a14e83ad..124591f49fe 100644 --- a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt +++ b/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt @@ -2,4 +2,4 @@ fun foo(r: Runnable) {} fun test() { foo { } -} \ No newline at end of file +} diff --git a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out b/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.args b/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.args deleted file mode 100644 index 996624d1a53..00000000000 --- a/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.args +++ /dev/null @@ -1,4 +0,0 @@ -$TESTDATA_DIR$/newInferenceImpliesSamConversions.kt --d -$TEMP_DIR$ --Xnew-inference \ No newline at end of file diff --git a/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out b/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java index 5c1a3d574de..e886389195b 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java @@ -720,11 +720,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/internalArgWrongPrefix.args"); } - @TestMetadata("internalArgumentOverrideExtraArgument.args") - public void testInternalArgumentOverrideExtraArgument() throws Exception { - runTest("compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.args"); - } - @TestMetadata("invalidMetadataVersion.args") public void testInvalidMetadataVersion() throws Exception { runTest("compiler/testData/cli/jvm/invalidMetadataVersion.args"); @@ -980,21 +975,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.args"); } - @TestMetadata("newInferenceImpliesProgressiveModeForNI.args") - public void testNewInferenceImpliesProgressiveModeForNI() throws Exception { - runTest("compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.args"); - } - - @TestMetadata("newInferenceImpliesSamConversions.args") - public void testNewInferenceImpliesSamConversions() throws Exception { - runTest("compiler/testData/cli/jvm/newInferenceImpliesSamConversions.args"); - } - - @TestMetadata("newInferenceWithOldFlagImpliesSamConversions.args") - public void testNewInferenceWithOldFlagImpliesSamConversions() throws Exception { - runTest("compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.args"); - } - @TestMetadata("newLineInPackage.args") public void testNewLineInPackage() throws Exception { runTest("compiler/testData/cli/jvm/newLineInPackage.args");