azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: fix language version in tests about PRE_RELEASE_CLASS

Browse Source 
Do not force language version to be LATEST_STABLE. There are now two
versions of this test, one for K1 (LV <= 1.9) and another for K2 (LV >=
2.0), and language version is chosen automatically in `compileKotlin`.
This commit is contained in:
Alexander Udalov
2023-08-11 23:51:04 +02:00
committed by Space Team
parent 9de6df6104
commit d81c79b3bc
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt
+7 -7
View File
@@ -124,10 +124,7 @@ abstract class AbstractCompileKotlinAgainstCustomBinariesTest : AbstractKotlinCo
else -> throw UnsupportedOperationException(compiler.toString()) else -> throw UnsupportedOperationException(compiler.toString())
} }
compileKotlin( compileKotlin("source.kt", usageDestination, listOf(result), compiler, additionalOptions.toList())
"source.kt", usageDestination, listOf(result), compiler,
additionalOptions.toList() + listOf("-language-version", LanguageVersion.LATEST_STABLE.versionString)
)
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
@@ -247,7 +244,8 @@ abstract class AbstractCompileKotlinAgainstCustomBinariesTest : AbstractKotlinCo
doTestBrokenLibrary("library", "test/A\$Anno.class") doTestBrokenLibrary("library", "test/A\$Anno.class")
} }
fun testReleaseCompilerAgainstPreReleaseLibrary() { // KT-60780 K2: missing PRE_RELEASE_CLASS
fun testReleaseCompilerAgainstPreReleaseLibrary() = muteForK2 {
doTestPreReleaseKotlinLibrary(K2JVMCompiler(), "library", tmpdir) doTestPreReleaseKotlinLibrary(K2JVMCompiler(), "library", tmpdir)
} }
@@ -256,7 +254,8 @@ abstract class AbstractCompileKotlinAgainstCustomBinariesTest : AbstractKotlinCo
// doTestPreReleaseKotlinLibrary(K2JSCompiler(), "library", File(tmpdir, "usage.js")) // doTestPreReleaseKotlinLibrary(K2JSCompiler(), "library", File(tmpdir, "usage.js"))
// } // }
fun testReleaseCompilerAgainstPreReleaseLibrarySkipPrereleaseCheck() { // KT-60780 K2: missing PRE_RELEASE_CLASS
fun testReleaseCompilerAgainstPreReleaseLibrarySkipPrereleaseCheck() = muteForK2 {
doTestPreReleaseKotlinLibrary(K2JVMCompiler(), "library", tmpdir, "-Xskip-prerelease-check") doTestPreReleaseKotlinLibrary(K2JVMCompiler(), "library", tmpdir, "-Xskip-prerelease-check")
} }
@@ -265,7 +264,8 @@ abstract class AbstractCompileKotlinAgainstCustomBinariesTest : AbstractKotlinCo
// doTestPreReleaseKotlinLibrary(K2JSCompiler(), "library", File(tmpdir, "usage.js"), "-Xskip-prerelease-check") // doTestPreReleaseKotlinLibrary(K2JSCompiler(), "library", File(tmpdir, "usage.js"), "-Xskip-prerelease-check")
// } // }
fun testReleaseCompilerAgainstPreReleaseLibrarySkipMetadataVersionCheck() { // KT-60780 K2: missing PRE_RELEASE_CLASS
fun testReleaseCompilerAgainstPreReleaseLibrarySkipMetadataVersionCheck() = muteForK2 {
doTestPreReleaseKotlinLibrary(K2JVMCompiler(), "library", tmpdir, "-Xskip-metadata-version-check") doTestPreReleaseKotlinLibrary(K2JVMCompiler(), "library", tmpdir, "-Xskip-metadata-version-check")
} }