diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/bytecode/AnnotationsRemoverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/bytecode/AnnotationsRemoverTest.kt
index ef603853718..2fafd4b3ef8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/bytecode/AnnotationsRemoverTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/bytecode/AnnotationsRemoverTest.kt
@@ -96,7 +96,7 @@ class AnnotationsRemoverTest {
val byteOut = ByteArrayOutputStream()
val exitCode = PrintStream(byteOut).use { err ->
- K2JVMCompiler().exec(err, *ktFiles, "-d", outputDir.absolutePath)
+ K2JVMCompiler().exec(err, *ktFiles, "-d", outputDir.absolutePath, "-Xadd-compiler-builtins")
}
if (exitCode != ExitCode.OK) {
diff --git a/libraries/tools/kotlin-script-util/pom.xml b/libraries/tools/kotlin-script-util/pom.xml
index 0bde17084b9..f4038901169 100644
--- a/libraries/tools/kotlin-script-util/pom.xml
+++ b/libraries/tools/kotlin-script-util/pom.xml
@@ -34,6 +34,12 @@
kotlin-stdlib
${project.version}
+
+ org.jetbrains.kotlin
+ kotlin-test-junit
+ ${project.version}
+ test
+
org.jetbrains.kotlin
kotlin-compiler
@@ -103,7 +109,8 @@
${env.JDK_17}/bin/java
- ${org.jetbrains.kotlin:kotlin-stdlib:jar}
+ ${org.jetbrains.kotlin:kotlin-runtime:jar}
+ ${org.jetbrains.kotlin:kotlin-stdlib:jar}
diff --git a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt
index bf437e2ff5b..ecd44c39938 100644
--- a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt
+++ b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt
@@ -41,6 +41,7 @@ import java.io.PrintStream
import java.net.URI
import java.util.jar.Manifest
import kotlin.reflect.KClass
+import kotlin.test.*
class ScriptUtilIT {
@@ -121,9 +122,14 @@ done
try {
val configuration = CompilerConfiguration().apply {
addJvmClasspathRoots(PathUtil.getJdkClassesRoots())
- val rtJar = System.getProperty("kotlin.java.runtime.jar")
- Assert.assertNotNull(rtJar)
- addJvmClasspathRoot(File(rtJar))
+ fun addJarFromSystemProperty(key: String) {
+ val jarFile = File(System.getProperty(key) ?: fail("'$key' property is not set"))
+ assertTrue(jarFile.exists())
+ addJvmClasspathRoot(jarFile)
+ }
+ addJarFromSystemProperty("kotlin.java.runtime.jar")
+ addJarFromSystemProperty("kotlin.java.stdlib.jar")
+
put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
addKotlinSourceRoot(scriptPath)
getResourcePathForClass(DependsOn::class.java).let {