From 3abd8b1ab280a3a34ccb2165ee738cf428a1a4ef Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Fri, 4 Dec 2020 18:44:28 +0300 Subject: [PATCH] Adapt CliTests for api requirement of @JvmRecord --- compiler/testData/cli/jvm/{jvmRecordOk.kt => jvmRecord.kt} | 0 compiler/testData/cli/jvm/jvmRecordOk.args | 6 +++++- compiler/testData/cli/jvm/jvmRecordWrongTarget.args | 6 +++++- compiler/testData/cli/jvm/jvmRecordWrongTarget.kt | 2 -- 4 files changed, 10 insertions(+), 4 deletions(-) rename compiler/testData/cli/jvm/{jvmRecordOk.kt => jvmRecord.kt} (100%) delete mode 100644 compiler/testData/cli/jvm/jvmRecordWrongTarget.kt diff --git a/compiler/testData/cli/jvm/jvmRecordOk.kt b/compiler/testData/cli/jvm/jvmRecord.kt similarity index 100% rename from compiler/testData/cli/jvm/jvmRecordOk.kt rename to compiler/testData/cli/jvm/jvmRecord.kt diff --git a/compiler/testData/cli/jvm/jvmRecordOk.args b/compiler/testData/cli/jvm/jvmRecordOk.args index f8aa7b4e607..b975df8aa47 100644 --- a/compiler/testData/cli/jvm/jvmRecordOk.args +++ b/compiler/testData/cli/jvm/jvmRecordOk.args @@ -1,6 +1,10 @@ -$TESTDATA_DIR$/jvmRecordWrongTarget.kt +$TESTDATA_DIR$/jvmRecord.kt -d $TEMP_DIR$ +-api-version +1.5 +-language-version +1.5 -jdk-home $JDK_15$ -XXLanguage:+JvmRecordSupport diff --git a/compiler/testData/cli/jvm/jvmRecordWrongTarget.args b/compiler/testData/cli/jvm/jvmRecordWrongTarget.args index 86dc212f348..807f3b5ee9a 100644 --- a/compiler/testData/cli/jvm/jvmRecordWrongTarget.args +++ b/compiler/testData/cli/jvm/jvmRecordWrongTarget.args @@ -1,6 +1,10 @@ -$TESTDATA_DIR$/jvmRecordWrongTarget.kt +$TESTDATA_DIR$/jvmRecord.kt -d $TEMP_DIR$ +-api-version +1.5 +-language-version +1.5 -cp $JDK_15$ -XXLanguage:+JvmRecordSupport diff --git a/compiler/testData/cli/jvm/jvmRecordWrongTarget.kt b/compiler/testData/cli/jvm/jvmRecordWrongTarget.kt deleted file mode 100644 index 429d606052c..00000000000 --- a/compiler/testData/cli/jvm/jvmRecordWrongTarget.kt +++ /dev/null @@ -1,2 +0,0 @@ -@JvmRecord -data class MyRec(val name: String)