From c2bb8d6de0db72ca84ab1ea2d6499786f45ed852 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 29 Apr 2022 12:26:01 +0400 Subject: [PATCH] [Test] Fix CLI tests due to migration from -Xuse-fir to -Xuse-k2 flag --- compiler/testData/cli/js/fir.args | 2 +- compiler/testData/cli/jvm/pluginWithK2Error.args | 2 +- compiler/testData/cli/jvm/pluginWithK2Error.out | 4 ++-- compiler/testData/cli/metadata/fir.args | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/testData/cli/js/fir.args b/compiler/testData/cli/js/fir.args index 89ec64d69d8..be9f65c0793 100644 --- a/compiler/testData/cli/js/fir.args +++ b/compiler/testData/cli/js/fir.args @@ -1,4 +1,4 @@ $TESTDATA_DIR$/fir.kt --Xuse-fir +-Xuse-k2 -output $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/pluginWithK2Error.args b/compiler/testData/cli/jvm/pluginWithK2Error.args index 32f95b44ec5..f2ff81689dd 100644 --- a/compiler/testData/cli/jvm/pluginWithK2Error.args +++ b/compiler/testData/cli/jvm/pluginWithK2Error.args @@ -7,4 +7,4 @@ plugin\:org.jetbrains.kotlin.android\:package=com.myapp plugin\:org.jetbrains.kotlin.android\:variant=main;$TESTDATA_DIR$/androidPlugin/res $TESTDATA_DIR$/pluginSimple.kt $TESTDATA_DIR$/androidPlugin --Xuse-fir +-Xuse-k2 diff --git a/compiler/testData/cli/jvm/pluginWithK2Error.out b/compiler/testData/cli/jvm/pluginWithK2Error.out index df2bf311d62..0027adf8884 100644 --- a/compiler/testData/cli/jvm/pluginWithK2Error.out +++ b/compiler/testData/cli/jvm/pluginWithK2Error.out @@ -1,6 +1,6 @@ warning: ATTENTION! - This build uses in-dev FIR: - -Xuse-fir + This build uses experimental K2 compiler: + -Xuse-k2 error: compiler plugins are enabled with K2 compiler. K2 does not support plugins yet, so please remove -Xuse-k2 flag COMPILATION_ERROR diff --git a/compiler/testData/cli/metadata/fir.args b/compiler/testData/cli/metadata/fir.args index 71e85bf191a..4c95db9e856 100644 --- a/compiler/testData/cli/metadata/fir.args +++ b/compiler/testData/cli/metadata/fir.args @@ -1,4 +1,4 @@ $TESTDATA_DIR$/fir.kt --Xuse-fir +-Xuse-k2 -d $TEMP_DIR$