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

Add -Xuse-fir-lt=false to some scripting tests

Browse Source 
make them compatible with K2
This commit is contained in:
Mikhail Glukhikh
2023-07-11 14:29:12 +02:00
committed by Space Team
parent 6144ae7a6f
commit f9c7a88175
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt
+7 -5
View File
@@ -152,8 +152,10 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
fun testSimpleScriptLocal() { fun testSimpleScriptLocal() {
val messageCollector = TestMessageCollector() val messageCollector = TestMessageCollector()
val (code, outputs) = compileLocally(messageCollector, File(getSimpleScriptBaseDir(), "script.kts").absolutePath, val (code, outputs) = compileLocally(
"-d", tmpdir.absolutePath, "-Xreport-output-files", "-Xallow-any-scripts-in-source-roots") 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.assertEquals(0, code)
Assert.assertTrue(outputs.isNotEmpty()) Assert.assertTrue(outputs.isNotEmpty())
Assert.assertEquals(File(tmpdir, "Script.class").absolutePath, outputs.first().outputFile?.absolutePath) Assert.assertEquals(File(tmpdir, "Script.class").absolutePath, outputs.first().outputFile?.absolutePath)
@@ -172,9 +174,9 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
inheritMemoryLimits = false, inheritOtherJvmOptions = false, inheritAdditionalProperties = false) inheritMemoryLimits = false, inheritOtherJvmOptions = false, inheritAdditionalProperties = false)
try { try {
val (code, outputs) = compileOnDaemon( val (code, outputs) = compileOnDaemon(
flagFile, compilerId, daemonJVMOptions, daemonOptions, TestMessageCollector(), flagFile, compilerId, daemonJVMOptions, daemonOptions, TestMessageCollector(),
File(getSimpleScriptBaseDir(), "script.kts").absolutePath, File(getSimpleScriptBaseDir(), "script.kts").absolutePath,
"-Xreport-output-files", "-Xallow-any-scripts-in-source-roots", "-d", tmpdir.absolutePath "-Xreport-output-files", "-Xuse-fir-lt=false", "-Xallow-any-scripts-in-source-roots", "-d", tmpdir.absolutePath
) )
Assert.assertEquals(0, code) Assert.assertEquals(0, code)
Assert.assertTrue(outputs.isNotEmpty()) Assert.assertTrue(outputs.isNotEmpty())
compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java
+1 -1
View File
@@ -119,7 +119,7 @@ public class CompilerSmokeTest extends CompilerSmokeTestBase {
public void testCompileScript() throws Exception { public void testCompileScript() throws Exception {
String jar = tmpdir.getAbsolutePath() + File.separator + "script.jar"; 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 { public void testInlineOnly() throws Exception {
plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt
+2 -1
View File
@@ -201,7 +201,8 @@ class ScriptingCompilerPluginTest : TestCase() {
val cp = (runtimeClasspath + scriptingClasspath + defsOut).joinToString(File.pathSeparator) val cp = (runtimeClasspath + scriptingClasspath + defsOut).joinToString(File.pathSeparator)
val exitCode = K2JVMCompiler().exec( val exitCode = K2JVMCompiler().exec(
System.err, 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) Assert.assertEquals(ExitCode.OK, exitCode)
plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt
+1
View File
@@ -251,6 +251,7 @@ class ScriptingWithCliCompilerTest {
arrayOf( arrayOf(
"-P", "plugin:kotlin.scripting:disable-script-definitions-autoloading=true", "-P", "plugin:kotlin.scripting:disable-script-definitions-autoloading=true",
"-cp", getMainKtsClassPath().joinToString(File.pathSeparator), "-d", tmpdir.path, "-cp", getMainKtsClassPath().joinToString(File.pathSeparator), "-d", tmpdir.path,
"-Xuse-fir-lt=false",
"-Xallow-any-scripts-in-source-roots", "-verbose", fileArg "-Xallow-any-scripts-in-source-roots", "-verbose", fileArg
) )
) )
prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt
+1 -1
View File
@@ -80,7 +80,7 @@ class CompilerClientIT {
fun testSimpleScript() { fun testSimpleScript() {
val (out, code) = runCompiler( val (out, code) = runCompiler(
"-cp", compilationClasspath.joinToString(File.pathSeparator) { it.canonicalPath }, "-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) File("testData/scripts/simpleHelloWorld.kts").canonicalPath)
assertEquals(0, code, "compilation failed:\n" + out + "\n") assertEquals(0, code, "compilation failed:\n" + out + "\n")
} }