From e10ca44c827d351d36aa657bc43c3e94f0c47473 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dweiss@apache.org>
Date: Tue, 5 Nov 2013 22:38:18 +0000
Subject: [PATCH] Reverting 1539106.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1539170 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/idea/.idea/libraries/JUnit.xml      |  2 +-
 lucene/CHANGES.txt                            |  3 --
 lucene/analysis/build.xml                     |  1 -
 lucene/build.xml                              |  2 +-
 lucene/common-build.xml                       | 52 ++-----------------
 lucene/ivy-versions.properties                |  2 +-
 lucene/licenses/junit4-ant-2.0.12.jar.sha1    |  1 +
 lucene/licenses/junit4-ant-2.0.13.jar.sha1    |  1 -
 .../randomizedtesting-runner-2.0.12.jar.sha1  |  1 +
 .../randomizedtesting-runner-2.0.13.jar.sha1  |  1 -
 solr/build.xml                                |  2 +-
 solr/licenses/junit4-ant-2.0.12.jar.sha1      |  1 +
 solr/licenses/junit4-ant-2.0.13.jar.sha1      |  1 -
 .../randomizedtesting-runner-2.0.12.jar.sha1  |  1 +
 .../randomizedtesting-runner-2.0.13.jar.sha1  |  1 -
 15 files changed, 12 insertions(+), 60 deletions(-)
 create mode 100644 lucene/licenses/junit4-ant-2.0.12.jar.sha1
 delete mode 100644 lucene/licenses/junit4-ant-2.0.13.jar.sha1
 create mode 100644 lucene/licenses/randomizedtesting-runner-2.0.12.jar.sha1
 delete mode 100644 lucene/licenses/randomizedtesting-runner-2.0.13.jar.sha1
 create mode 100644 solr/licenses/junit4-ant-2.0.12.jar.sha1
 delete mode 100644 solr/licenses/junit4-ant-2.0.13.jar.sha1
 create mode 100644 solr/licenses/randomizedtesting-runner-2.0.12.jar.sha1
 delete mode 100644 solr/licenses/randomizedtesting-runner-2.0.13.jar.sha1

diff --git a/dev-tools/idea/.idea/libraries/JUnit.xml b/dev-tools/idea/.idea/libraries/JUnit.xml
index b3c2d128f00..44fe35d4ac0 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.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.12.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 94f256809fb..b9a13c48007 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -262,9 +262,6 @@ Changes in backwards compatibility policy
 
 Build
 
-* LUCENE-5283: Fail the build if ant test didn't execute any tests 
-  (everything filtered out). (Dawid Weiss)
-
 * LUCENE-5249, LUCENE-5257: All Lucene/Solr modules should use the same
   dependency versions. (Steve Rowe)
   
diff --git a/lucene/analysis/build.xml b/lucene/analysis/build.xml
index 5ab5c8d10da..c0c16e3d53d 100644
--- a/lucene/analysis/build.xml
+++ b/lucene/analysis/build.xml
@@ -46,7 +46,6 @@
     <propertyref regex=".*\.uptodate$$"/>
     <propertyref regex=".*\.compiled$$"/>
     <propertyref regex=".*\.loaded$$"/>
-    <propertyref name="tests.totals.tmpfile" />
   </propertyset>
 
   <target name="common">
diff --git a/lucene/build.xml b/lucene/build.xml
index 74f40db8e55..ee10754ccec 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -52,7 +52,7 @@
   </target>
 
   <!-- "-clover.load" is *not* a useless dependency. do not remove -->
-  <target name="test" depends="-clover.load, -init-totals, test-core, test-modules, test-backwards, -check-totals"
+  <target name="test" depends="-clover.load, test-core, test-modules, test-backwards"
           description="Runs all unit tests (core, modules and back-compat)"
   />
 
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 3a287d42916..12725747165 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -263,7 +263,6 @@
     <propertyref regex=".*\.compiled$$"/>
     <propertyref regex=".*\.loaded$$"/>
     <propertyref name="lucene.javadoc.url"/><!-- for Solr -->
-    <propertyref name="tests.totals.tmpfile" />
   </propertyset>
 
   <patternset id="lucene.local.src.package.patterns"
@@ -881,16 +880,12 @@
         <property name="tests.caches" location="${common.dir}/tools/junit4" /> <!-- defaults -->
         <mkdir dir="${tests.cachedir}/${name}" />
 
-        <local name="junit4.stats.nonIgnored" />
-
         <junit4:junit4
             taskName="junit4"
             dir="@{workDir}"
             tempdir="@{workDir}/temp"
-            maxmemory="${tests.heapsize}"
-
-            statsPropertyPrefix="junit4.stats"
-
+            maxmemory="${tests.heapsize}" 
+            
             parallelism="@{threadNum}"
 
             printSummary="true"
@@ -1040,7 +1035,7 @@
                   </junit4:filtertrace>                    
                 </junit4:report-text>
 
-                <!-- Emits full status for all tests, their relative order on forked JVMs. -->
+                <!-- Emits full status for all tests, their relative order on slaves. -->
                 <junit4:report-text
                     file="@{junit.output.dir}/tests-report.txt"
                     showThrowable="true" 
@@ -1095,9 +1090,6 @@
             </junit4:duplicate>
         </junit4:junit4>
 
-        <!-- Append the number of non-ignored (actually executed) tests. -->
-        <echo file="${tests.totals.tmpfile}" append="true" encoding="UTF-8"># module: ${ant.project.name}&#x000a;${junit4.stats.nonIgnored}&#x000a;</echo>
-
         <!-- Report the 5 slowest tests from this run to the console. -->
         <echo>5 slowest tests:</echo>
         <junit4:tophints max="5">
@@ -1262,47 +1254,11 @@ ${tests-output}/junit4-*.suites     - per-JVM executed suites
 
   <!-- note: order here is important, the taskdef depends on test-framework
        jars so we just order it after compile-test to ensure that -->
-  <target name="test" depends="clover,compile-test,install-junit4-taskdef,validate,-init-totals,-test,-check-totals" description="Runs unit tests">
-  </target>
-
-  <!-- Run the actual tests (must be wrapped with -init-totals, -check-totals) -->
-  <target name="-test">
+  <target name="test" depends="clover,compile-test,install-junit4-taskdef,validate" description="Runs unit tests">
     <mkdir dir="${junit.output.dir}"/>
     <test-macro threadNum="${tests.jvms.override}" />
   </target>
 
-  <target name="-check-totals" if="tests.totals.toplevel">
-    <!-- We are concluding a test pass at the outermost level. Sum up all executed tests. -->
-    <local name="tests.totals.content" />
-    <loadfile srcFile="${tests.totals.tmpfile}" encoding="UTF-8" property="tests.totals.content" quiet="true" />
-    <fail message="Not even a single test was executed (a typo in the filter pattern maybe)?">
-      <condition>
-        <scriptcondition language="javascript"><![CDATA[
-          var lines = ("" + project.getProperty("tests.totals.content")).split(/\n/);
-          var total = 0;
-          for (var i = 0; i < lines.length; i++) {
-            if (/^[0-9]+/.test(lines[i])) {
-              total += parseInt(lines[i]);
-            }
-          }
-          self.setValue(total == 0);
-        ]]></scriptcondition>
-      </condition>
-    </fail>
-  </target>
-
-  <target name="-init-totals" unless="tests.totals.tmpfile">
-    <echo>## TOTALS: init</echo>
-
-    <tempfile property="tests.totals.tmpfile"
-              destdir="${basedir}"
-              prefix=".test-totals-"
-              suffix=".tmp"
-              deleteonexit="true"
-              createfile="true" />
-    <property name="tests.totals.toplevel" value="true" />
-  </target>
-
   <!--
    See http://issues.apache.org/jira/browse/LUCENE-721
    -->
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index a71f538dc51..077b7ddbc90 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -4,7 +4,7 @@
 
 /cglib/cglib-nodep = 2.2
 
-com.carrotsearch.randomizedtesting.version = 2.0.13
+com.carrotsearch.randomizedtesting.version = 2.0.12
 /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
 /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}
 
diff --git a/lucene/licenses/junit4-ant-2.0.12.jar.sha1 b/lucene/licenses/junit4-ant-2.0.12.jar.sha1
new file mode 100644
index 00000000000..ce03d7bb6bc
--- /dev/null
+++ b/lucene/licenses/junit4-ant-2.0.12.jar.sha1
@@ -0,0 +1 @@
+7e82374008eb6810e2b22c877ecd4c179cdac1ea
diff --git a/lucene/licenses/junit4-ant-2.0.13.jar.sha1 b/lucene/licenses/junit4-ant-2.0.13.jar.sha1
deleted file mode 100644
index 4c41a16e0fe..00000000000
--- a/lucene/licenses/junit4-ant-2.0.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-33904a47c5f920d270437ea1075cc9fa5ecb8099
diff --git a/lucene/licenses/randomizedtesting-runner-2.0.12.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.0.12.jar.sha1
new file mode 100644
index 00000000000..49ceb681f3f
--- /dev/null
+++ b/lucene/licenses/randomizedtesting-runner-2.0.12.jar.sha1
@@ -0,0 +1 @@
+0a9b381e004bf866aa3783412e5a03ebfff48ea3
diff --git a/lucene/licenses/randomizedtesting-runner-2.0.13.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.0.13.jar.sha1
deleted file mode 100644
index 3ad2bb603f7..00000000000
--- a/lucene/licenses/randomizedtesting-runner-2.0.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bdacac985583621c50de414b1d45b1e6e43f6d1f
diff --git a/solr/build.xml b/solr/build.xml
index baabb63213f..b2a56e41932 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -130,7 +130,7 @@
           depends="compile-core, compile-contrib"/>
 
   <target name="test" description="Validate, then run core, solrj, and contrib unit tests."
-          depends="-init-totals, test-core, test-contrib, -check-totals"/>
+          depends="test-core, test-contrib"/>
   <!-- "-clover.load" is *not* a useless dependency. do not remove -->
   <target name="test-core" description="Runs the core and solrj unit tests."
           depends="-clover.load, test-solr-core, test-solrj"/>
diff --git a/solr/licenses/junit4-ant-2.0.12.jar.sha1 b/solr/licenses/junit4-ant-2.0.12.jar.sha1
new file mode 100644
index 00000000000..ce03d7bb6bc
--- /dev/null
+++ b/solr/licenses/junit4-ant-2.0.12.jar.sha1
@@ -0,0 +1 @@
+7e82374008eb6810e2b22c877ecd4c179cdac1ea
diff --git a/solr/licenses/junit4-ant-2.0.13.jar.sha1 b/solr/licenses/junit4-ant-2.0.13.jar.sha1
deleted file mode 100644
index 4c41a16e0fe..00000000000
--- a/solr/licenses/junit4-ant-2.0.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-33904a47c5f920d270437ea1075cc9fa5ecb8099
diff --git a/solr/licenses/randomizedtesting-runner-2.0.12.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.0.12.jar.sha1
new file mode 100644
index 00000000000..49ceb681f3f
--- /dev/null
+++ b/solr/licenses/randomizedtesting-runner-2.0.12.jar.sha1
@@ -0,0 +1 @@
+0a9b381e004bf866aa3783412e5a03ebfff48ea3
diff --git a/solr/licenses/randomizedtesting-runner-2.0.13.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.0.13.jar.sha1
deleted file mode 100644
index 3ad2bb603f7..00000000000
--- a/solr/licenses/randomizedtesting-runner-2.0.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bdacac985583621c50de414b1d45b1e6e43f6d1f