From b4916b5b9d85cc90c6c2a874121dcdfa62004c0a Mon Sep 17 00:00:00 2001 From: brett Date: Wed, 21 Apr 2004 01:06:52 +0000 Subject: [PATCH] PR: MPTEST-26 add maven.junit.jvm property git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115031 13f79535-47bb-0310-9956-ffa450edef68 --- test/plugin.jelly | 11 ++++++++++- test/plugin.properties | 1 + test/project.properties | 1 - test/xdocs/changes.xml | 1 + test/xdocs/properties.xml | 9 +++++++++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/test/plugin.jelly b/test/plugin.jelly index 38b5b61f..035a04f6 100644 --- a/test/plugin.jelly +++ b/test/plugin.jelly @@ -110,6 +110,9 @@ + + + @@ -214,6 +217,9 @@ fork="${maven.junit.fork}" dir="${maven.junit.dir}"> + + + ${maven.junit.sysproperties} @@ -277,13 +283,16 @@ classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" /> - Searching directory ${maven.test.searchdir} + Searching directory ${maven.test.searchdir} + + + ${maven.junit.sysproperties} diff --git a/test/plugin.properties b/test/plugin.properties index f2711fbc..115ba29e 100644 --- a/test/plugin.properties +++ b/test/plugin.properties @@ -24,6 +24,7 @@ maven.junit.dir = ${basedir} maven.junit.fork = no maven.junit.format=brief maven.junit.jvmargs= +maven.junit.jvm= maven.junit.printSummary=true maven.junit.usefile = true diff --git a/test/project.properties b/test/project.properties index 4fd2c5aa..83969c40 100644 --- a/test/project.properties +++ b/test/project.properties @@ -20,4 +20,3 @@ maven.xdoc.date=left ## maven.xdoc.version=${pom.currentVersion} maven.license.licenseFile=${basedir}/../../../LICENSE.txt - diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml index 5e43c282..b82c7a4a 100644 --- a/test/xdocs/changes.xml +++ b/test/xdocs/changes.xml @@ -25,6 +25,7 @@ + add maven.junit.jvm property accept maven.test.failure.ignore == false Honour maven.test.failure.ignore for test:single and test:match diff --git a/test/xdocs/properties.xml b/test/xdocs/properties.xml index 98bdab78..88a86f7d 100644 --- a/test/xdocs/properties.xml +++ b/test/xdocs/properties.xml @@ -73,6 +73,15 @@ task printSummary attribute. + + maven.junit.jvm + Yes + + If this property is set it is used as the JVM for the junit tests + to run in. This is passed to the Ant junit task in the jvm property. + If maven.junit.fork is not true, this is ignored. + + maven.test.dest Yes