Try to find tools.jar automatically

Author: tschuchortdev

src/main/kotlin/com/tschuchort/compiletesting/JavacUtils.kt

@@ -100,5 +100,9 @@ internal fun isJavac9OrLater(javacVersionString: String): Boolean {
 }
 
 /** Finds the tools.jar given a path to a JDK 8 or earlier */
-internal fun findToolsJarFromJdk(jdkHome: File): File
-        = File(jdkHome.absolutePath + "/../lib/tools.jar").also { check(it.isFile) }
+internal fun findToolsJarFromJdk(jdkHome: File): File {
+    return jdkHome.resolve("../lib/tools.jar").existsOrNull()
+        ?: jdkHome.resolve("lib/tools.jar").existsOrNull()
+        ?: jdkHome.resolve("tools.jar").existsOrNull()
+        ?: throw IllegalStateException("Can not find tools.jar from JDK with path ${jdkHome.absolutePath}")
+}

src/main/kotlin/com/tschuchort/compiletesting/KotlinCompilation.kt

@@ -270,7 +270,11 @@ class KotlinCompilation {
 	 * internal compiler error!
 	 */
 	var toolsJar: File? by default {
-		findInHostClasspath(hostClasspaths, "tools.jar", Regex("tools.jar"))
+        if (!isJdk9OrLater())
+            jdkHome?.let { findToolsJarFromJdk(it) }
+            ?: findInHostClasspath(hostClasspaths, "tools.jar", Regex("tools.jar"))
+        else
+            null
 	}
 
 	// Directory for input source files

src/main/kotlin/com/tschuchort/compiletesting/Utils.kt

@@ -97,4 +97,6 @@ internal inline fun <R> captureSystemOut(crossinline f: () -> R): Pair<R, String
     val systemOutBuffer = Buffer()
     val ret = withSystemOut(PrintStream(systemOutBuffer.outputStream()), f)
     return Pair(ret, systemOutBuffer.readString(Charset.defaultCharset()))
-}
+}
+
+internal fun File.existsOrNull(): File? = if (exists()) this else null

src/test/kotlin/com/tschuchort/compiletesting/KotlinCompilationTests.kt

@@ -630,12 +630,6 @@ class KotlinCompilationTests {
 	private fun defaultCompilerConfig(): KotlinCompilation {
 		return KotlinCompilation().apply {
 			workingDir = temporaryFolder.root
-
-			toolsJar = if(isJdk9OrLater())
-				null
-			else
-				jdkHome!!.resolve("lib\\tools.jar")
-
 			inheritClassPath = false
 			skipRuntimeVersionCheck = true
 			correctErrorTypes = true