From b3c300709c03dcdacb79a214fb068acf9e5837c1 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dweiss@apache.org>
Date: Wed, 5 Sep 2012 10:05:44 +0000
Subject: [PATCH] LUCENE-4360: Support running the same test suite multiple
 times in parallel.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1381123 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/eclipse/dot.classpath          |  2 +-
 dev-tools/idea/.idea/libraries/JUnit.xml |  2 +-
 dev-tools/maven/pom.xml.template         |  2 +-
 lucene/CHANGES.txt                       |  3 +++
 lucene/common-build.xml                  | 20 +++++++++++++++-----
 lucene/test-framework/ivy.xml            |  4 ++--
 solr/test-framework/ivy.xml              |  4 ++--
 7 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index 0c61c3f9475..5ae10d5b723 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -166,7 +166,7 @@
   <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
   <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar"/>
+  <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.jar"/>
   <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar"/>
   <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar"/>
   <classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.7.0.jar"/>
diff --git a/dev-tools/idea/.idea/libraries/JUnit.xml b/dev-tools/idea/.idea/libraries/JUnit.xml
index c8db190a706..397758cc9aa 100644
--- a/dev-tools/idea/.idea/libraries/JUnit.xml
+++ b/dev-tools/idea/.idea/libraries/JUnit.xml
@@ -2,7 +2,7 @@
   <library name="JUnit">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 85a79cebfd1..cab6c15332c 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -434,7 +434,7 @@
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
-        <version>2.0.0.rc5</version>
+        <version>2.0.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 444a4f501b0..906303562e7 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -160,6 +160,9 @@ Optimizations
 
 Build
 
+* LUCENE-4360: Support running the same test suite multiple times in 
+  parallel (Dawid Weiss)
+
 * LUCENE-3985: Upgrade to randomizedtesting 2.0.0. Added support for 
   thread leak detection. Added support for suite timeouts. (Dawid Weiss)
 
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 60c62ca7f31..57f2c75a877 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -712,6 +712,7 @@
         <property name="tests.dynamicAssignmentRatio" value="0.50" /> <!-- 50% of suites -->
         <property name="tests.haltonfailure" value="true" />
         <property name="tests.iters" value="" />
+        <property name="tests.dups"  value="1" />
 
         <!-- Pick the random seed now (unless already set). -->
         <junit4:pickseed property="tests.seed" />
@@ -751,6 +752,7 @@
             seed="${tests.seed}"
 
             heartbeat="${tests.heartbeat}"
+            uniqueSuiteNames="false"
         >
             <!-- Classpaths. -->
             <classpath refid="@{junit.classpath}"/>
@@ -908,11 +910,13 @@
             </listeners>
 
             <!-- Input test classes. -->
-            <fileset dir="@{testsDir}">
-              <include name="**/Test*.class" />
-              <include name="**/*Test.class" />
-              <exclude name="**/*$*" />
-            </fileset>
+            <junit4:duplicate times="${tests.dups}">
+              <fileset dir="@{testsDir}">
+                <include name="**/Test*.class" />
+                <include name="**/*Test.class" />
+                <exclude name="**/*$*" />
+              </fileset>
+            </junit4:duplicate>
         </junit4:junit4>
 
         <!-- Report the 5 slowest tests from this run to the console. -->
@@ -988,6 +992,12 @@ ant test -Dtests.iters=N -Dtestcase=ClassName -Dtests.method=mytest*
 ant test -Dtests.iters=N -Dtests.failfast=yes -Dtestcase=...
 ant test -Dtests.iters=N -Dtests.maxfailures=M -Dtestcase=...
 
+# Repeats every suite (class) and any tests inside N times
+# can be combined with -Dtestcase or -Dtests.iters, etc.
+# Can be used for running a single class on multiple JVMs
+# in parallel.
+ant test -Dtests.dups=N ...
+
 #
 # Test groups. ----------------------------------------------------
 #
diff --git a/lucene/test-framework/ivy.xml b/lucene/test-framework/ivy.xml
index 8a9a71f89e7..ec2389efe3d 100644
--- a/lucene/test-framework/ivy.xml
+++ b/lucene/test-framework/ivy.xml
@@ -32,8 +32,8 @@
       <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
 
       <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.0.rc5" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.0.rc5" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.0" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.0" transitive="false" conf="default->*;junit4-stdalone->*" />
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>
diff --git a/solr/test-framework/ivy.xml b/solr/test-framework/ivy.xml
index 3bf2fd4f965..96f6ed142b8 100644
--- a/solr/test-framework/ivy.xml
+++ b/solr/test-framework/ivy.xml
@@ -32,8 +32,8 @@
       <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
 
       <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.0.rc5" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.0.rc5" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.0" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.0" transitive="false" conf="default->*;junit4-stdalone->*" />
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>