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

[minor] uncomment 2 scripting tests:

Browse Source 
Tests were failing before, but now fixed, most likely by switching to
default target 1.8 and some changes in scripting IR support.
#KT-44471 fixed
This commit is contained in:
Ilya Chernikov
2021-02-05 13:28:11 +01:00
parent ef01411d20
commit 9c786a9cd9
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
+10 -10
View File
@@ -239,16 +239,16 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
} }
fun testScriptWithXArguments() { fun testScriptWithXArguments() {
// runProcess( runProcess(
// "kotlin", "$testDataDirectory/funWithResultReturn.kts", "kotlin", "$testDataDirectory/funWithResultReturn.kts",
// expectedExitCode = 1, expectedExitCode = 1,
// expectedStderr = """error: 'kotlin.Result' cannot be used as a return type (funWithResultReturn.kts:2:11) expectedStderr = """error: 'kotlin.Result' cannot be used as a return type (funWithResultReturn.kts:2:11)
//compiler/testData/launcher/funWithResultReturn.kts:2:11: error: 'kotlin.Result' cannot be used as a return type compiler/testData/launcher/funWithResultReturn.kts:2:11: error: 'kotlin.Result' cannot be used as a return type
//fun f() : Result<Int> = Result.success(42) fun f() : Result<Int> = Result.success(42)
// ^ ^
//""" """
// ) )
// runProcess("kotlin", "-Xallow-result-return-type", "$testDataDirectory/funWithResultReturn.kts", expectedStdout = "42\n") runProcess("kotlin", "-Xallow-result-return-type", "$testDataDirectory/funWithResultReturn.kts", expectedStdout = "42\n")
} }
fun testNoStdLib() { fun testNoStdLib() {
libraries/scripting/jsr223-test/test/kotlin/script/experimental/jsr223/test/KotlinJsr223ScriptEngineIT.kt
+4 -4
View File
@@ -321,10 +321,10 @@ obj
scriptEngine.put("aValue", 3) scriptEngine.put("aValue", 3)
// val res1 = scriptEngine.eval(script1) val res1 = scriptEngine.eval(script1)
// Assert.assertEquals(1, res1) Assert.assertEquals(1, res1)
// val res2 = scriptEngine.eval(script2) val res2 = scriptEngine.eval(script2)
// Assert.assertEquals(2, res2) Assert.assertEquals(2, res2)
} }
@Test @Test