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

Fix KAPT cli tests on windows

Browse Source 
- Fix line separator issue
- Always quote args with delimiters (=, :)
- fix one of args files by removing obsolete stdlib reference
- Fix kotlinc.bat to ensure lazy evaluation of additional classpath
This commit is contained in:
Ivan Gavrilovic
2020-12-04 17:42:50 +00:00
committed by max-kammerer
parent 82ad230e0d
commit 078aa18479
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/bin/kotlinc.bat
+2 -1
View File
@@ -49,6 +49,7 @@ if "%_KOTLIN_RUNNER%"=="1" (
"%_JAVACMD%" %JAVA_OPTS% "-Dkotlin.home=%_KOTLIN_HOME%" -cp "%_KOTLIN_HOME%\lib\kotlin-runner.jar" ^ "%_JAVACMD%" %JAVA_OPTS% "-Dkotlin.home=%_KOTLIN_HOME%" -cp "%_KOTLIN_HOME%\lib\kotlin-runner.jar" ^
org.jetbrains.kotlin.runner.Main %KOTLIN_OPTS% org.jetbrains.kotlin.runner.Main %KOTLIN_OPTS%
) else ( ) else (
setlocal EnableDelayedExpansion
SET _ADDITIONAL_CLASSPATH= SET _ADDITIONAL_CLASSPATH=
if not "%_KOTLIN_TOOL%"=="" ( if not "%_KOTLIN_TOOL%"=="" (
@@ -56,7 +57,7 @@ if "%_KOTLIN_RUNNER%"=="1" (
) )
"%_JAVACMD%" %JAVA_OPTS% -noverify -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^ "%_JAVACMD%" %JAVA_OPTS% -noverify -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
org.jetbrains.kotlin.preloading.Preloader -cp "%_KOTLIN_HOME%\lib\kotlin-compiler.jar%_ADDITIONAL_CLASSPATH%" ^ org.jetbrains.kotlin.preloading.Preloader -cp "%_KOTLIN_HOME%\lib\kotlin-compiler.jar!_ADDITIONAL_CLASSPATH!" ^
%_KOTLIN_COMPILER% %KOTLIN_OPTS% %_KOTLIN_COMPILER% %KOTLIN_OPTS%
) )
plugins/kapt3/kapt3-cli/test/org/jetbrains/kotlin/kapt/cli/test/AbstractArgumentParsingTest.kt
+1 -1
View File
@@ -25,7 +25,7 @@ abstract class AbstractArgumentParsingTest : TestCase() {
val before = sections.single { it.name == "before" } val before = sections.single { it.name == "before" }
val messageCollector = TestMessageCollector() val messageCollector = TestMessageCollector()
val transformedArgs = transformArgs(before.content.split(LINE_SEPARATOR), messageCollector, isTest = true) val transformedArgs = transformArgs(before.content.lines(), messageCollector, isTest = true)
val actualAfter = if (messageCollector.hasErrors()) messageCollector.toString() else transformedArgs.joinToString(LINE_SEPARATOR) val actualAfter = if (messageCollector.hasErrors()) messageCollector.toString() else transformedArgs.joinToString(LINE_SEPARATOR)
val actual = sections.replacingSection("after", actualAfter).render() val actual = sections.replacingSection("after", actualAfter).render()
plugins/kapt3/kapt3-cli/test/org/jetbrains/kotlin/kapt/cli/test/AbstractKaptToolIntegrationTest.kt
+8 -1
View File
@@ -103,7 +103,14 @@ abstract class AbstractKaptToolIntegrationTest : TestCaseWithTmpdir() {
} }
private fun transformArguments(args: List<String>): List<String> { private fun transformArguments(args: List<String>): List<String> {
return args.map { it.replace("%KOTLIN_STDLIB%", File("dist/kotlinc/lib/kotlin-stdlib.jar").absolutePath) } return args.map {
val arg = it.replace("%KOTLIN_STDLIB%", File("dist/kotlinc/lib/kotlin-stdlib.jar").absolutePath)
if (SystemInfo.isWindows && (arg.contains("=") || arg.contains(":"))) {
"\"" + arg + "\""
} else {
arg
}
}
} }
private fun getJdk8Home(): File { private fun getJdk8Home(): File {
plugins/kapt3/kapt3-cli/testData/integration/argfile/kaptArgs.txt
Vendored
+1 -1
View File
@@ -4,5 +4,5 @@
-Kapt-classpath=output/ap -Kapt-classpath=output/ap
-Kapt-processors=apt.SampleApt -Kapt-processors=apt.SampleApt
-d output/classes -d output/classes
-cp output/ap:%KOTLIN_STDLIB% -cp output/ap
Test.kt Test.kt