From 50ef5e3269825aa64502bf42a2a8fc528c3e7095 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 8 May 2016 22:08:57 -0800 Subject: [PATCH] [GITHUB-0.772] Bad flags from IJvmTestContributor. Fixes https://github.com/cbeust/kobalt/issues/196 --- .../com/beust/kobalt/internal/GenericRunner.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt index 16188c0c..7da58b79 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt @@ -63,31 +63,31 @@ abstract class GenericTestRunner: ITestRunnerContributor { addAll(testConfig.jvmArgs) add("-classpath") add(classpath.map { it.jarFile.get().absolutePath }.joinToString(File.pathSeparator)) - add(mainClass) } val pluginInfo = Kobalt.INJECTOR.getInstance(PluginInfo::class.java) // JVM flags from the contributors - val flagsFromContributors = pluginInfo.testJvmFlagContributors.flatMap { + val jvmFlagsFromContributors = pluginInfo.testJvmFlagContributors.flatMap { it.testJvmFlagsFor(project, context, jvmFlags) } // JVM flags from the interceptors (these overwrite flags instead of just adding to the list) - var interceptedArgs = ArrayList(jvmFlags + flagsFromContributors) + var interceptedJvmFlags = ArrayList(jvmFlags + jvmFlagsFromContributors) pluginInfo.testJvmFlagInterceptors.forEach { - val newFlags = it.testJvmFlagsFor(project, context, interceptedArgs) - interceptedArgs.clear() - interceptedArgs.addAll(newFlags) + val newFlags = it.testJvmFlagsFor(project, context, interceptedJvmFlags) + interceptedJvmFlags.clear() + interceptedJvmFlags.addAll(newFlags) } - if (interceptedArgs.any()) { - log(2, "Final JVM test flags after running the contributors and interceptors: $interceptedArgs") + if (interceptedJvmFlags.any()) { + log(2, "Final JVM test flags after running the contributors and interceptors: $interceptedJvmFlags") } val allArgs = arrayListOf().apply { add(java!!.absolutePath) - addAll(interceptedArgs) + addAll(interceptedJvmFlags) + add(mainClass) addAll(args) }