From a91bd04e41549959c901dda053e2b751fca84476 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 15 Mar 2017 14:38:11 -0700 Subject: [PATCH] Test fix. --- src/test/kotlin/com/beust/kobalt/BaseTest.kt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/test/kotlin/com/beust/kobalt/BaseTest.kt b/src/test/kotlin/com/beust/kobalt/BaseTest.kt index 763404f7..cecabeba 100644 --- a/src/test/kotlin/com/beust/kobalt/BaseTest.kt +++ b/src/test/kotlin/com/beust/kobalt/BaseTest.kt @@ -8,6 +8,7 @@ import com.beust.kobalt.internal.KobaltPluginXml import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.internal.build.BuildFile import com.beust.kobalt.misc.KobaltLogger +import com.beust.kobalt.misc.log import org.testng.annotations.BeforeClass import java.io.File import java.nio.file.Files @@ -58,14 +59,24 @@ open class BaseTest(val compilerFactory: BuildFileCompiler.IFactory? = null) { fun compileBuildFile(projectDirectory: String, buildFileText: String, args: Args = Args()) : BuildFileCompiler .FindProjectResult { KobaltLogger.LOG_LEVEL = 3 - val path = Paths.get(projectDirectory) - val tmpBuildFile = File(path.toFile(), "Build.kt").apply { + val actualBuildFilePath = Paths.get(projectDirectory, "kobalt", "src") + val actualBuildFile = File(actualBuildFilePath.toFile(), "Build.kt").apply { + File(parent).mkdirs() deleteOnExit() writeText(buildFileText) } - val thisBuildFile = BuildFile(Paths.get(tmpBuildFile.absolutePath), "Build.kt") + val tmpBuildFilePath = Paths.get(Files.createTempDirectory("").toFile().absolutePath, "kobalt", "src") + val tmpBuildFile = File(tmpBuildFilePath.toFile(), "Build.kt").apply { + File(parent).mkdirs() + deleteOnExit() + writeText(buildFileText) + } + + val thisBuildFile = BuildFile(Paths.get(tmpBuildFile.absolutePath), "Build.kt", + Paths.get(actualBuildFile.absolutePath)) + Kobalt.context?.log(2, "About to compile build file $thisBuildFile .kobaltDir: " + thisBuildFile.dotKobaltDir) args.apply { - buildFile = tmpBuildFile.absolutePath + buildFile = actualBuildFile.absolutePath noIncremental = true noIncrementalKotlin = true }