Index: dev-tools/idea/.idea/libraries/JUnit.xml =================================================================== --- dev-tools/idea/.idea/libraries/JUnit.xml (revision 1539323) +++ dev-tools/idea/.idea/libraries/JUnit.xml (working copy) @@ -2,7 +2,7 @@ - + Index: lucene/CHANGES.txt =================================================================== --- lucene/CHANGES.txt (revision 1539323) +++ lucene/CHANGES.txt (working copy) @@ -262,6 +262,9 @@ 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) Index: lucene/analysis/build.xml =================================================================== --- lucene/analysis/build.xml (revision 1539323) +++ lucene/analysis/build.xml (working copy) @@ -46,6 +46,7 @@ + Index: lucene/build.xml =================================================================== --- lucene/build.xml (revision 1539323) +++ lucene/build.xml (working copy) @@ -52,7 +52,7 @@ - Index: lucene/common-build.xml =================================================================== --- lucene/common-build.xml (revision 1539323) +++ lucene/common-build.xml (working copy) @@ -263,6 +263,7 @@ + + + - + + + # module: ${ant.project.name} ${junit4.stats.nonIgnored} + 5 slowest tests: @@ -1254,11 +1262,49 @@ - + + + + + + + + + + + if (line ==~ /^[0-9]+/) { + total += Integer.valueOf(line); + } + }); + statsFile.delete(); + + if (total == 0) { + throw new org.apache.tools.ant.BuildException("Not even a single test was executed (a typo in the filter pattern maybe)?"); + } + + // Interesting but let's keep the build output quiet. + // project.log("Grand total of all executed tests (including sub-modules): " + total); + ]]> + + + + + + + + Index: lucene/ivy-versions.properties =================================================================== --- lucene/ivy-versions.properties (revision 1539323) +++ lucene/ivy-versions.properties (working copy) @@ -4,7 +4,7 @@ /cglib/cglib-nodep = 2.2 -com.carrotsearch.randomizedtesting.version = 2.0.12 +com.carrotsearch.randomizedtesting.version = 2.0.13 /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version} Index: lucene/licenses/junit4-ant-2.0.12.jar.sha1 =================================================================== --- lucene/licenses/junit4-ant-2.0.12.jar.sha1 (revision 1539323) +++ lucene/licenses/junit4-ant-2.0.12.jar.sha1 (working copy) @@ -1 +0,0 @@ -7e82374008eb6810e2b22c877ecd4c179cdac1ea Index: lucene/licenses/junit4-ant-2.0.13.jar.sha1 =================================================================== --- lucene/licenses/junit4-ant-2.0.13.jar.sha1 (revision 0) +++ lucene/licenses/junit4-ant-2.0.13.jar.sha1 (working copy) @@ -0,0 +1 @@ +33904a47c5f920d270437ea1075cc9fa5ecb8099 Property changes on: lucene/licenses/junit4-ant-2.0.13.jar.sha1 ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: lucene/licenses/randomizedtesting-runner-2.0.12.jar.sha1 =================================================================== --- lucene/licenses/randomizedtesting-runner-2.0.12.jar.sha1 (revision 1539323) +++ lucene/licenses/randomizedtesting-runner-2.0.12.jar.sha1 (working copy) @@ -1 +0,0 @@ -0a9b381e004bf866aa3783412e5a03ebfff48ea3 Index: lucene/licenses/randomizedtesting-runner-2.0.13.jar.sha1 =================================================================== --- lucene/licenses/randomizedtesting-runner-2.0.13.jar.sha1 (revision 0) +++ lucene/licenses/randomizedtesting-runner-2.0.13.jar.sha1 (working copy) @@ -0,0 +1 @@ +bdacac985583621c50de414b1d45b1e6e43f6d1f Property changes on: lucene/licenses/randomizedtesting-runner-2.0.13.jar.sha1 ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: solr/build.xml =================================================================== --- solr/build.xml (revision 1539323) +++ solr/build.xml (working copy) @@ -130,7 +130,7 @@ depends="compile-core, compile-contrib"/> + depends="-init-totals, test-core, test-contrib, -check-totals"/> Index: solr/licenses/junit4-ant-2.0.12.jar.sha1 =================================================================== --- solr/licenses/junit4-ant-2.0.12.jar.sha1 (revision 1539323) +++ solr/licenses/junit4-ant-2.0.12.jar.sha1 (working copy) @@ -1 +0,0 @@ -7e82374008eb6810e2b22c877ecd4c179cdac1ea Index: solr/licenses/junit4-ant-2.0.13.jar.sha1 =================================================================== --- solr/licenses/junit4-ant-2.0.13.jar.sha1 (revision 0) +++ solr/licenses/junit4-ant-2.0.13.jar.sha1 (working copy) @@ -0,0 +1 @@ +33904a47c5f920d270437ea1075cc9fa5ecb8099 Property changes on: solr/licenses/junit4-ant-2.0.13.jar.sha1 ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: solr/licenses/randomizedtesting-runner-2.0.12.jar.sha1 =================================================================== --- solr/licenses/randomizedtesting-runner-2.0.12.jar.sha1 (revision 1539323) +++ solr/licenses/randomizedtesting-runner-2.0.12.jar.sha1 (working copy) @@ -1 +0,0 @@ -0a9b381e004bf866aa3783412e5a03ebfff48ea3 Index: solr/licenses/randomizedtesting-runner-2.0.13.jar.sha1 =================================================================== --- solr/licenses/randomizedtesting-runner-2.0.13.jar.sha1 (revision 0) +++ solr/licenses/randomizedtesting-runner-2.0.13.jar.sha1 (working copy) @@ -0,0 +1 @@ +bdacac985583621c50de414b1d45b1e6e43f6d1f Property changes on: solr/licenses/randomizedtesting-runner-2.0.13.jar.sha1 ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property