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

LV20 update scripting test mute logic for K2

Browse Source 
after switching to LV20 by default
This commit is contained in:
Ilya Chernikov
2023-08-24 17:33:37 +02:00
committed by Space Team
parent 5b64741609
commit 8a10070772
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/commonUtil.kt
+1 -1
View File
@@ -21,7 +21,7 @@ internal fun <R> withTempDir(keyName: String = "tmp", body: (File) -> R) {
} }
fun expectTestToFailOnK2(test: () -> Unit) { fun expectTestToFailOnK2(test: () -> Unit) {
val isK2 = System.getProperty(SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY)?.contains("-language-version 2.0") == true val isK2 = System.getProperty(SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY)?.contains("-language-version 1.9") != true
var testFailure: Throwable? = null var testFailure: Throwable? = null
try { try {
test() test()
plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/testUtil.kt
+2 -2
View File
@@ -283,8 +283,8 @@ fun CompilerConfiguration.updateWithBaseCompilerArguments() {
} }
fun expectTestToFailOnK2(test: () -> Unit) { fun expectTestToFailOnK2(test: () -> Unit) {
val isK2 = System.getProperty(SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY)?.contains("-language-version 2.0") == true || val isK2 = System.getProperty(SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY)?.contains("-language-version 1.9") != true &&
System.getProperty(SCRIPT_TEST_BASE_COMPILER_ARGUMENTS_PROPERTY)?.contains("-language-version 2.0") == true System.getProperty(SCRIPT_TEST_BASE_COMPILER_ARGUMENTS_PROPERTY)?.contains("-language-version 1.9") != true
var testFailure: Throwable? = null var testFailure: Throwable? = null
try { try {
test() test()