diff --git a/test/plugin.jelly b/test/plugin.jelly index 2b897bf2..dcb7abd4 100644 --- a/test/plugin.jelly +++ b/test/plugin.jelly @@ -130,7 +130,9 @@ + fork="${maven.junit.fork}" + forkmode="${maven.junit.forkmode}"> + @@ -248,7 +250,8 @@ + dir="${maven.junit.dir}" + forkmode="${maven.junit.forkmode}"> @@ -332,7 +335,8 @@ + dir="${maven.junit.dir}" + forkmode="${maven.junit.forkmode}"> diff --git a/test/plugin.properties b/test/plugin.properties index a01ff3d5..02436a6d 100644 --- a/test/plugin.properties +++ b/test/plugin.properties @@ -22,6 +22,7 @@ maven.junit.dir = ${basedir} maven.junit.fork = no +maven.junit.forkmode=perTest maven.junit.format=brief maven.junit.jvmargs= maven.junit.envvars= diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml index db1dd577..ae317899 100644 --- a/test/xdocs/changes.xml +++ b/test/xdocs/changes.xml @@ -25,6 +25,7 @@ + Added maven.junit.forkmode property Allow multiple patterns in testmatchpattern and testnotmatchpattern Added testnotmatchpattern that can be used in test:match Deprecated testmatch property by testmatchpattern to allow more complex patterns in test:match diff --git a/test/xdocs/properties.xml b/test/xdocs/properties.xml index 93a571df..544c9bc2 100644 --- a/test/xdocs/properties.xml +++ b/test/xdocs/properties.xml @@ -37,6 +37,21 @@ no. + + maven.junit.forkmode + Yes + + Controls how many Java Virtual Machines get created if you want + to fork some tests. Possible values are "perTest" (the default), + and "once". "once" creates only a single Java VM for + all tests while "perTest" creates a new VM for each TestCase class. + Note that only tests with the same settings of + filtertrace, haltonerror, haltonfailure, errorproperty and failureproperty + can share a VM, so even if you set forkmode to "once", Ant may have + to create more than a single Java VM. This attribute is ignored for + tests that don't get forked into a new Java VM. + + maven.junit.format Yes