From 1cc474434511d1dd3d56911801529a6e4135ef6e Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 6 Feb 2018 22:57:45 +0300 Subject: [PATCH] Kapt: Map URLs to absolute file paths properly, also add some logging --- .../kotlin/kapt3/test/java9TestUtils.kt | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt index aecfe906aa7..3229a427a0d 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt @@ -37,18 +37,24 @@ interface Java9TestLauncher { assert(javaExe.exists()) { "Can't find 'java' executable in $jdk9Home" } val currentJavaHome = System.getProperty("java.home") - val classpath = collectClasspath(AbstractClassFileToSourceStubConverterTest::class.java.classLoader) - .filter { !it.path.startsWith(currentJavaHome) } - val process = ProcessBuilder( - javaExe.absolutePath, - "--illegal-access=warn", - "-ea", - "-classpath", - classpath.joinToString(File.pathSeparator), - mainClass.name, - arg - ).inheritIO().start() + val classpath = collectClasspath(AbstractClassFileToSourceStubConverterTest::class.java.classLoader) + .filter { it.protocol.toLowerCase() == "file" && it.path != null && !it.path.startsWith(currentJavaHome) } + .map { it.path } + + val command = arrayOf( + javaExe.absolutePath, + "--illegal-access=warn", + "-ea", + "-classpath", + classpath.joinToString(File.pathSeparator), + mainClass.name, + arg + ) + + println("Process arguments: [${command.joinToString()}]") + + val process = ProcessBuilder(*command).inheritIO().start() process.waitFor(3, TimeUnit.MINUTES) if (process.exitValue() != 0) {