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

Migrate all JDK 9 related tests to JDK 11

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-09-22 17:21:53 +03:00
committed by TeamCityServer
parent ce3562f0e8
commit de7fb9606a
92 changed files with 284 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/JvmCompilationUtils.kt
+2 -2
View File
@@ -55,8 +55,8 @@ fun compileJavaFiles(
}
}
fun compileJavaFilesExternallyWithJava9(files: Collection<File>, options: List<String?>): Boolean {
return compileJavaFilesExternally(files, options, KtTestUtil.getJdk9Home())
fun compileJavaFilesExternallyWithJava11(files: Collection<File>, options: List<String?>): Boolean {
return compileJavaFilesExternally(files, options, KtTestUtil.getJdk11Home())
}
fun compileJavaFilesExternally(files: Collection<File>, options: List<String?>, jdkHome: File): Boolean {
compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
+8 -8
View File
@@ -38,7 +38,7 @@ object MockLibraryUtil {
extraOptions: List<String> = emptyList(),
extraClasspath: List<String> = emptyList(),
extraModulepath: List<String> = emptyList(),
useJava9: Boolean = false,
useJava11: Boolean = false,
assertions: Assertions
): File {
return compileLibraryToJar(
@@ -50,7 +50,7 @@ object MockLibraryUtil {
extraOptions,
extraClasspath,
extraModulepath,
useJava9,
useJava11,
assertions
)
}
@@ -64,7 +64,7 @@ object MockLibraryUtil {
extraClasspath: List<String> = emptyList(),
extraModulepath: List<String> = emptyList(),
assertions: Assertions,
useJava9: Boolean = false
useJava11: Boolean = false
): File {
return compileJvmLibraryToJar(
sourcesPath, jarName, addSources,
@@ -72,7 +72,7 @@ object MockLibraryUtil {
extraOptions,
extraClasspath,
extraModulepath,
useJava9,
useJava11,
assertions
)
}
@@ -88,10 +88,10 @@ object MockLibraryUtil {
extraOptions: List<String> = emptyList(),
extraClasspath: List<String> = emptyList(),
extraModulepath: List<String> = emptyList(),
useJava9: Boolean = false,
useJava11: Boolean = false,
assertions: Assertions
): File {
assertTrue("Module path can be used only for compilation using javac 9 and higher", useJava9 || extraModulepath.isEmpty())
assertTrue("Module path can be used only for compilation using javac 9 and higher", useJava11 || extraModulepath.isEmpty())
val classesDir = File(contentDir, "classes")
@@ -121,14 +121,14 @@ object MockLibraryUtil {
add("-d")
add(classesDir.path)
if (useJava9 && extraModulepath.isNotEmpty()) {
if (useJava11 && extraModulepath.isNotEmpty()) {
add("--module-path")
add(extraModulepath.joinToString(File.pathSeparator))
}
}
val compile =
if (useJava9) ::compileJavaFilesExternallyWithJava9
if (useJava11) ::compileJavaFilesExternallyWithJava11
else { files, opts -> compileJavaFiles(files, opts, assertions = assertions) }
val success = compile(javaFiles, options)