diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt index d13453d44e2..a10cc97b3e0 100644 --- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt +++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt @@ -152,8 +152,10 @@ class CompilerApiTest : KotlinIntegrationTestBase() { fun testSimpleScriptLocal() { val messageCollector = TestMessageCollector() - val (code, outputs) = compileLocally(messageCollector, File(getSimpleScriptBaseDir(), "script.kts").absolutePath, - "-d", tmpdir.absolutePath, "-Xreport-output-files", "-Xallow-any-scripts-in-source-roots") + val (code, outputs) = compileLocally( + messageCollector, File(getSimpleScriptBaseDir(), "script.kts").absolutePath, + "-d", tmpdir.absolutePath, "-Xreport-output-files", "-Xuse-fir-lt=false", "-Xallow-any-scripts-in-source-roots" + ) Assert.assertEquals(0, code) Assert.assertTrue(outputs.isNotEmpty()) Assert.assertEquals(File(tmpdir, "Script.class").absolutePath, outputs.first().outputFile?.absolutePath) @@ -172,9 +174,9 @@ class CompilerApiTest : KotlinIntegrationTestBase() { inheritMemoryLimits = false, inheritOtherJvmOptions = false, inheritAdditionalProperties = false) try { val (code, outputs) = compileOnDaemon( - flagFile, compilerId, daemonJVMOptions, daemonOptions, TestMessageCollector(), - File(getSimpleScriptBaseDir(), "script.kts").absolutePath, - "-Xreport-output-files", "-Xallow-any-scripts-in-source-roots", "-d", tmpdir.absolutePath + flagFile, compilerId, daemonJVMOptions, daemonOptions, TestMessageCollector(), + File(getSimpleScriptBaseDir(), "script.kts").absolutePath, + "-Xreport-output-files", "-Xuse-fir-lt=false", "-Xallow-any-scripts-in-source-roots", "-d", tmpdir.absolutePath ) Assert.assertEquals(0, code) Assert.assertTrue(outputs.isNotEmpty()) diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java index b85a56689ed..287ca4f79a4 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java @@ -119,7 +119,7 @@ public class CompilerSmokeTest extends CompilerSmokeTestBase { public void testCompileScript() throws Exception { String jar = tmpdir.getAbsolutePath() + File.separator + "script.jar"; - runCompiler("script", "-Xallow-any-scripts-in-source-roots", "script.kts", "-d", jar); + runCompiler("script", "-Xuse-fir-lt=false", "-Xallow-any-scripts-in-source-roots", "script.kts", "-d", jar); } public void testInlineOnly() throws Exception { diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt index 4e4ed5a522b..2b040cfd2cc 100644 --- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt +++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt @@ -201,7 +201,8 @@ class ScriptingCompilerPluginTest : TestCase() { val cp = (runtimeClasspath + scriptingClasspath + defsOut).joinToString(File.pathSeparator) val exitCode = K2JVMCompiler().exec( System.err, - "-cp", cp, *(scriptFiles.toTypedArray()), "-d", scriptsOut2.canonicalPath, "-Xallow-any-scripts-in-source-roots" + "-cp", cp, *(scriptFiles.toTypedArray()), "-d", scriptsOut2.canonicalPath, "-Xallow-any-scripts-in-source-roots", + "-Xuse-fir-lt=false" ) Assert.assertEquals(ExitCode.OK, exitCode) diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt index 02d56a816d0..432c3c999b4 100644 --- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt +++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt @@ -251,6 +251,7 @@ class ScriptingWithCliCompilerTest { arrayOf( "-P", "plugin:kotlin.scripting:disable-script-definitions-autoloading=true", "-cp", getMainKtsClassPath().joinToString(File.pathSeparator), "-d", tmpdir.path, + "-Xuse-fir-lt=false", "-Xallow-any-scripts-in-source-roots", "-verbose", fileArg ) ) diff --git a/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt b/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt index 1dc94ee136b..7c0abe65f21 100644 --- a/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt +++ b/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt @@ -80,7 +80,7 @@ class CompilerClientIT { fun testSimpleScript() { val (out, code) = runCompiler( "-cp", compilationClasspath.joinToString(File.pathSeparator) { it.canonicalPath }, - "-Xallow-any-scripts-in-source-roots", + "-Xuse-fir-lt=false", "-Xallow-any-scripts-in-source-roots", File("testData/scripts/simpleHelloWorld.kts").canonicalPath) assertEquals(0, code, "compilation failed:\n" + out + "\n") }