Enable K2 scripting tests

libraries/scripting/jvm-host-test/build.gradle.kts

@@ -56,5 +56,5 @@ projectTest(parallel = true) {
 projectTest(taskName = "testWithK2", parallel = true) {
     dependsOn(":dist")
     workingDir = rootDir
-    systemProperty("kotlin.script.base.compiler.arguments", "-Xuse-k2")
+    systemProperty("kotlin.script.base.compiler.arguments", "-language-version 2.0")
 }

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/CachingTest.kt

@@ -43,7 +43,7 @@ class CachingTest : TestCase() {
     }
 
     @Test
-    fun testSimpleImportWithMemoryCache() {
+    fun testSimpleImportWithMemoryCache() = expectTestToFailOnK2 {
         val cache = SimpleMemoryScriptsCache()
         checkWithCache(
             cache, scriptWithImport, scriptWithImportExpectedOutput,
@@ -63,7 +63,7 @@ class CachingTest : TestCase() {
     }
 
     @Test
-    fun testSimpleImportWithFileCache() {
+    fun testSimpleImportWithFileCache() = expectTestToFailOnK2 {
         withTempDir("scriptingTestCache") { cacheDir ->
             val cache = FileBasedScriptCache(cacheDir)
             Assert.assertEquals(true, cache.baseDir.listFiles()?.isEmpty())
@@ -90,7 +90,7 @@ class CachingTest : TestCase() {
     }
 
     @Test
-    fun testSimpleImportWithJarCache() {
+    fun testSimpleImportWithJarCache() = expectTestToFailOnK2 {
         withTempDir("scriptingTestJarCache") { cacheDir ->
             val cache = TestCompiledScriptJarsCache(cacheDir)
             Assert.assertTrue(cache.baseDir.listFiles()!!.isEmpty())
@@ -110,7 +110,7 @@ class CachingTest : TestCase() {
     }
 
     @Test
-    fun testImplicitReceiversWithJarCache() {
+    fun testImplicitReceiversWithJarCache() = expectTestToFailOnK2 {
         withTempDir("scriptingTestJarCache") { cacheDir ->
             val cache = TestCompiledScriptJarsCache(cacheDir)
             Assert.assertTrue(cache.baseDir.listFiles()!!.isEmpty())
@@ -181,7 +181,7 @@ class CachingTest : TestCase() {
     }
 
     @Test
-    fun testLocalDependencyWithExternalLoadAndCache() {
+    fun testLocalDependencyWithExternalLoadAndCache() = expectTestToFailOnK2 {
         withTempDir("scriptingTestDepDir") { depDir ->
             val standardJars = KotlinJars.kotlinScriptStandardJars
             val outJar = makeDependenciesJar(depDir, standardJars)

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/CapturingTest.kt

@@ -13,7 +13,7 @@ import kotlin.test.assertTrue
 class CapturingTest {
 
     @Test
-    fun testScriptWithImplicitReceiverAndSimpleCapturing() {
+    fun testScriptWithImplicitReceiverAndSimpleCapturing() = expectTestToFailOnK2 {
         // Reproducing (a bit extended) scenario from KT-53947: without the fix, in the presence of the implicit receiver
         // of the same type as the receiver in the `apply` function body, the lowering was incorrectly substituting
         // the correct receiver with the accessor to the implicit one
@@ -36,7 +36,7 @@ class CapturingTest {
     }
 
     @Test
-    fun testScriptWithImplicitReceiverAndNoCapturing() {
+    fun testScriptWithImplicitReceiverAndNoCapturing() = expectTestToFailOnK2 {
         // Reproducing (a bit extended) scenario from KT-53947: without the fix, in the presence of the implicit receiver
         // of the same type as the receiver in the `C2.apply` function body, the lowering was incorrectly substituting
         // the correct receiver with the accessor to the implicit one

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ConfigurationDslTest.kt

@@ -22,7 +22,7 @@ import kotlin.script.experimental.jvmhost.createJvmEvaluationConfigurationFromTe
 class ConfigurationDslTest : TestCase() {
 
     @Test
-    fun testComposableRefinementHandlers() {
+    fun testComposableRefinementHandlers() = expectTestToFailOnK2 {
         val baseConfig = createJvmCompilationConfigurationFromTemplate<SimpleScript> {
             updateClasspath(classpathFromClass<SimpleScript>())
             defaultImports(MyTestAnnotation1::class, MyTestAnnotation2::class)

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ConstructorArgumentOrderTest.kt

@@ -24,7 +24,7 @@ class ConstructorArgumentsOrderTest {
     }
 
     @Test
-    fun testScriptWithImplicitReceiver() {
+    fun testScriptWithImplicitReceiver() = expectTestToFailOnK2 {
         val res = evalString<ScriptWithImplicitReceiver>("""println(receiverString)""") {
             implicitReceivers(ImplicitReceiverClass("Hello Receiver!"))
         }
@@ -36,7 +36,7 @@ class ConstructorArgumentsOrderTest {
     }
 
     @Test
-    fun testScriptWithBoth() {
+    fun testScriptWithBoth() = expectTestToFailOnK2 {
         val res = evalString<ScriptWithBoth>("""println(providedString + receiverString)""") {
             providedProperties("providedString" to "Hello")
             implicitReceivers(ImplicitReceiverClass(" Both!"))

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ImplicitsFromScriptResultTest.kt

@@ -34,7 +34,8 @@ import kotlin.script.experimental.jvmhost.JvmScriptCompiler
  * underlying module will be introduced.
  */
 class ImplicitsFromScriptResultTest : TestCase() {
-    fun testImplicits() {
+
+    fun testImplicits() = expectTestToFailOnK2 {
         // the implementation of the Compiler Host doesn't work with IR - the inter-script symbol table
         // should be maintained to make it run (see latest REPL compiler implementations for details
         // TODO: consider either fix it or rewrite to the REPL compiler

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ResolveDependenciesTest.kt

@@ -41,26 +41,27 @@ class ResolveDependenciesTest : TestCase() {
         """.trimMargin()
     private val funAndValImportScript = funAndValImportScriptText.toScriptSource()
 
+    // All tests with dependencies from classloader are expected to fail until the KT-60443 is implemented
     @Test
-    fun testResolveClassFromClassloader() {
+    fun testResolveClassFromClassloader() = expectTestToFailOnK2 {
         runScriptAndCheckResult(classAccessScript, configurationWithDependenciesFromClassloader, null, 42)
         runScriptAndCheckResult(classImportScript, configurationWithDependenciesFromClassloader, null, 42)
     }
 
     @Test
-    fun testResolveClassFromClasspath() {
+    fun testResolveClassFromClasspath() = expectTestToFailOnK2 {
         runScriptAndCheckResult(classAccessScript, configurationWithDependenciesFromClasspath, null, 42)
         runScriptAndCheckResult(classImportScript, configurationWithDependenciesFromClasspath, null, 42)
     }
 
     @Test
-    fun testResolveFunAndValFromClassloader() {
+    fun testResolveFunAndValFromClassloader() = expectTestToFailOnK2 {
         runScriptAndCheckResult(funAndValAccessScript, configurationWithDependenciesFromClassloader, null, 42)
         runScriptAndCheckResult(funAndValImportScript, configurationWithDependenciesFromClassloader, null, 42)
     }
 
     @Test
-    fun testReplResolveFunAndValFromClassloader() {
+    fun testReplResolveFunAndValFromClassloader() = expectTestToFailOnK2 {
         checkEvaluateInRepl(
             sequenceOf(funAndValAccessScriptText, funAndValAccessScriptText), sequenceOf(42, 42),
             configurationWithDependenciesFromClassloader,
@@ -75,13 +76,13 @@ class ResolveDependenciesTest : TestCase() {
     }
 
     @Test
-    fun testResolveFunAndValFromClasspath() {
+    fun testResolveFunAndValFromClasspath() = expectTestToFailOnK2 {
         runScriptAndCheckResult(funAndValAccessScript, configurationWithDependenciesFromClasspath, null, 42)
         runScriptAndCheckResult(funAndValImportScript, configurationWithDependenciesFromClasspath, null, 42)
     }
 
     @Test
-    fun testResolveClassFromClassloaderIsolated() {
+    fun testResolveClassFromClassloaderIsolated() = expectTestToFailOnK2 {
         val evaluationConfiguration = ScriptEvaluationConfiguration {
             jvm {
                 baseClassLoader(null)
@@ -91,7 +92,7 @@ class ResolveDependenciesTest : TestCase() {
     }
 
     @Test
-    fun testResolveClassesFromClassloaderAndClassPath() {
+    fun testResolveClassesFromClassloaderAndClassPath() = expectTestToFailOnK2 {
         val script = """
             org.jetbrains.kotlin.mainKts.MainKtsConfigurator()
             ${thisPackage}.ShouldBeVisibleFromScript().x

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt

@@ -65,7 +65,7 @@ class ScriptingHostTest : TestCase() {
     }
 
     @Test
-    fun testValueResult() {
+    fun testValueResult() = expectTestToFailOnK2 {
         val evalScriptWithResult = evalScriptWithResult("42")
         val resVal = evalScriptWithResult as ResultValue.Value
         Assert.assertEquals(42, resVal.value)
@@ -91,7 +91,7 @@ class ScriptingHostTest : TestCase() {
     }
 
     @Test
-    fun testCustomResultField() {
+    fun testCustomResultField() = expectTestToFailOnK2 {
         val resVal = evalScriptWithResult("42") {
             resultField("outcome")
         } as ResultValue.Value
@@ -190,7 +190,7 @@ class ScriptingHostTest : TestCase() {
     }
 
     @Test
-    fun testSimpleImport() {
+    fun testSimpleImport() = expectTestToFailOnK2 {
         val greeting = listOf("Hello from helloWithVal script!", "Hello from imported helloWithVal script!")
         val script = "println(\"Hello from imported \$helloScriptName script!\")"
         val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<SimpleScriptTemplate> {
@@ -203,7 +203,7 @@ class ScriptingHostTest : TestCase() {
     }
 
     @Test
-    fun testSimpleImportWithImplicitReceiver() {
+    fun testSimpleImportWithImplicitReceiver() = expectTestToFailOnK2 {
         val greeting = listOf("Hello from helloWithVal script!", "Hello from imported helloWithVal script!")
         val script = "println(\"Hello from imported \$helloScriptName script!\")"
         val definition = createJvmScriptDefinitionFromTemplate<SimpleScriptTemplate>(
@@ -224,7 +224,7 @@ class ScriptingHostTest : TestCase() {
     }
 
     @Test
-    fun testProvidedPropertiesNullability() {
+    fun testProvidedPropertiesNullability() = expectTestToFailOnK2 {
         val stringType = KotlinType(String::class)
         val definition = createJvmScriptDefinitionFromTemplate<SimpleScriptTemplate>(
             compilation = {
@@ -273,14 +273,14 @@ class ScriptingHostTest : TestCase() {
     }
 
     @Test
-    fun testDiamondImportWithoutSharing() {
+    fun testDiamondImportWithoutSharing() = expectTestToFailOnK2 {
         val greeting = listOf("Hi from common", "Hi from middle", "Hi from common", "sharedVar == 3")
         val output = doDiamondImportTest()
         Assert.assertEquals(greeting, output)
     }
 
     @Test
-    fun testDiamondImportWithSharing() {
+    fun testDiamondImportWithSharing() = expectTestToFailOnK2 {
         val greeting = listOf("Hi from common", "Hi from middle", "sharedVar == 5")
         val output = doDiamondImportTest(
             ScriptEvaluationConfiguration {

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/commonUtil.kt

@@ -5,6 +5,7 @@
 
 package kotlin.script.experimental.jvmhost.test
 
+import org.jetbrains.kotlin.scripting.compiler.plugin.impl.SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY
 import java.io.File
 import java.nio.file.Files
 
@@ -19,3 +20,15 @@ internal fun <R> withTempDir(keyName: String = "tmp", body: (File) -> R) {
     }
 }
 
+fun expectTestToFailOnK2(test: () -> Unit) {
+    val isK2 = System.getProperty(SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY)?.contains("-language-version 2.0") == true
+    var testFailure: Throwable? = null
+    try {
+        test()
+    } catch (e: Throwable) {
+        testFailure = e
+    }
+    if (isK2 && testFailure == null) throw AssertionError("The test is expected to fail on K2")
+    else if (!isK2 && testFailure != null) throw testFailure
+}
+

libraries/tools/kotlin-main-kts-test/build.gradle.kts

@@ -33,7 +33,10 @@ projectTest(parallel = true) {
 }
 
 projectTest(taskName = "testWithK2", parallel = true) {
-    dependsOn(":dist")
+    dependsOn(":dist", ":kotlinx-serialization-compiler-plugin.embeddable:embeddable")
     workingDir = rootDir
-    systemProperty("kotlin.script.base.compiler.arguments", "-Xuse-k2")
+    val localKotlinxSerializationPluginClasspath: FileCollection = kotlinxSerializationGradlePluginClasspath
+    systemProperty("kotlin.script.test.kotlinx.serialization.plugin.classpath", localKotlinxSerializationPluginClasspath.asPath)
+    systemProperty("kotlin.script.base.compiler.arguments", "-language-version 2.0")
+    systemProperty("kotlin.script.test.base.compiler.arguments", "-language-version 2.0")
 }

libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt

@@ -7,10 +7,7 @@ package org.jetbrains.kotlin.mainKts.test
 
 import org.jetbrains.kotlin.mainKts.COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR
 import org.jetbrains.kotlin.mainKts.COMPILED_SCRIPTS_CACHE_DIR_PROPERTY
-import org.jetbrains.kotlin.scripting.compiler.plugin.runAndCheckResults
-import org.jetbrains.kotlin.scripting.compiler.plugin.runWithK2JVMCompiler
-import org.jetbrains.kotlin.scripting.compiler.plugin.runWithKotlinLauncherScript
-import org.jetbrains.kotlin.scripting.compiler.plugin.runWithKotlinc
+import org.jetbrains.kotlin.scripting.compiler.plugin.*
 import org.jetbrains.kotlin.utils.KotlinPaths
 import org.jetbrains.kotlin.utils.PathUtil
 import org.junit.Assert
@@ -69,7 +66,7 @@ class MainKtsIT {
 
     @OptIn(ExperimentalPathApi::class)
     @Test
-    fun testCache() {
+    fun testCache() = expectTestToFailOnK2 {
         val script = File("$TEST_DATA_ROOT/import-test.main.kts").absolutePath
         val cache = createTempDirectory("main.kts.test")
 
@@ -96,7 +93,7 @@ class MainKtsIT {
 
     @OptIn(ExperimentalPathApi::class)
     @Test
-    fun testCacheInProcess() {
+    fun testCacheInProcess() = expectTestToFailOnK2 {
         val script = File("$TEST_DATA_ROOT/import-test.main.kts").absolutePath
         val cache = createTempDirectory("main.kts.test")
 
@@ -123,7 +120,7 @@ class MainKtsIT {
 
     @OptIn(ExperimentalPathApi::class)
     @Test
-    fun testCacheWithFileLocation() {
+    fun testCacheWithFileLocation() = expectTestToFailOnK2 {
         val scriptPath = File("$TEST_DATA_ROOT/script-file-location-default.main.kts").absolutePath
         val cache = createTempDirectory("main.kts.test")
         val expectedTestOutput = listOf(Regex.escape(scriptPath))
@@ -185,11 +182,13 @@ fun runWithKotlinRunner(
     scriptPath: String,
     expectedOutPatterns: List<String> = emptyList(),
     expectedExitCode: Int = 0,
-    cacheDir: Path? = null
+    cacheDir: Path? = null,
+    expectErrorOnK2: Boolean = false
 ) {
     runWithKotlinLauncherScript(
         "kotlin", listOf(scriptPath), expectedOutPatterns, expectedExitCode,
-        additionalEnvVars = listOf(COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR to (cacheDir?.toAbsolutePath()?.toString() ?: ""))
+        additionalEnvVars = listOf(COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR to (cacheDir?.toAbsolutePath()?.toString() ?: "")),
+        expectErrorOnK2 = expectErrorOnK2
     )
 }
 

libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt

@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.mainKts.MainKtsScript
 import org.jetbrains.kotlin.mainKts.SCRIPT_FILE_LOCATION_DEFAULT_VARIABLE_NAME
 import org.jetbrains.kotlin.mainKts.impl.Directories
 import org.jetbrains.kotlin.scripting.compiler.plugin.assertTrue
+import org.jetbrains.kotlin.scripting.compiler.plugin.expectTestToFailOnK2
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Ignore
@@ -77,7 +78,7 @@ class MainKtsTest {
     }
 
     @Test
-    fun testResolveRuntimeDeps() {
+    fun testResolveRuntimeDeps() = expectTestToFailOnK2 {
         val resOk = evalFile(File("$TEST_DATA_ROOT/resolve-with-runtime.main.kts"))
         assertSucceeded(resOk)
 
@@ -125,7 +126,7 @@ class MainKtsTest {
     }
 
     @Test
-    fun testImport() {
+    fun testImport() = expectTestToFailOnK2 {
 
         val out = captureOut {
             val res = evalFile(File("$TEST_DATA_ROOT/import-test.main.kts"))
@@ -136,7 +137,7 @@ class MainKtsTest {
     }
 
     @Test
-    fun testImportWithCapture() {
+    fun testImportWithCapture() = expectTestToFailOnK2 {
 
         val out = captureOut {
             val res = evalFile(File("$TEST_DATA_ROOT/import-with-capture-test.main.kts"))
@@ -178,7 +179,7 @@ class MainKtsTest {
     }
 
     @Test
-    fun testScriptFileLocationDefaultVariable() {
+    fun testScriptFileLocationDefaultVariable() = expectTestToFailOnK2 {
         val resOk = evalFile(File("$TEST_DATA_ROOT/script-file-location-default.main.kts"))
         assertSucceeded(resOk)
         val resultValue = resOk.valueOrThrow().returnValue
@@ -191,7 +192,7 @@ class MainKtsTest {
     }
 
     @Test
-    fun testScriptFileLocationCustomizedVariable() {
+    fun testScriptFileLocationCustomizedVariable() = expectTestToFailOnK2 {
         val resOk = evalFile(File("$TEST_DATA_ROOT/script-file-location-customized.main.kts"))
         assertSucceeded(resOk)
         val resultValue = resOk.valueOrThrow().returnValue
@@ -204,7 +205,7 @@ class MainKtsTest {
     }
 
     @Test
-    fun testScriptFileLocationWithImportedScript() {
+    fun testScriptFileLocationWithImportedScript() = expectTestToFailOnK2 {
         val resOk = evalFile(File("$TEST_DATA_ROOT/script-file-location-with-imported-file.main.kts"))
         assertSucceeded(resOk)
         val resultValue = resOk.valueOrThrow().returnValue