revert accidental commit

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@784562 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -110,9 +110,10 @@
       </exec>
 	</sequential>
   </target>
-
-  <target name="compile-tag" depends="download-tag, compile-core, compile-demo, jar-core">
-    <sequential>
+	
+  <target name="test-tag" depends="download-tag, compile-core, compile-demo, jar-core"
+  	description="Runs tests of a previous Lucene version. Specify tag version like this: -Dtag=branches/lucene_2_4_back_compat_tests">
+	<sequential>
       <available property="tag.available" file="${tags.dir}/${tag}/src/test" />
 
 	  <fail unless="tag.available">
@@ -134,15 +135,12 @@
 	  <!-- compile tag tests against tag jar -->	
 	  <compile-test-macro srcdir="${tags.dir}/${tag}/src/test" destdir="${build.dir}/${tag}/classes/test"
 			  			  test.classpath="tag.test.classpath"/>
-    </sequential>
-  </target>
-	
-  <target name="test-tag"
-  	description="Runs tests of a previous Lucene version. Specify tag version like this: -Dtag=branches/lucene_2_4_back_compat_tests">
-    <!-- run tag tests against trunk jar -->
-    <test-macro dataDir="${tags.dir}/${tag}/src/test" 
-		tempDir="${build.dir}/${tag}"
-		junit.classpath="tag.junit.classpath"/>
+		
+	  <!-- run tag tests against trunk jar -->
+      <test-macro dataDir="${tags.dir}/${tag}/src/test" 
+      			  tempDir="${build.dir}/${tag}"
+      			  junit.classpath="tag.junit.classpath"/>
+  	</sequential>
   </target>	
 
 	
@@ -615,7 +613,7 @@
     <contrib-crawl target="build-artifacts-and-tests"/>
   </target>
 
-  <target name="test-contrib">
+  <target name="test-contrib" depends="build-contrib">
     <!-- Don't fail on error, instead check for flag file so we run
          all the tests possible and can "ant generate-test-reports"
          for all of them.

common-build.xml

@@ -378,8 +378,6 @@
 	      <not><or>
 	        <isset property="testcase" />
 	      	<isset property="testpackage" />
-	      	<isset property="testpackagea" />
-	      	<isset property="testpackageb" />
 	      	<isset property="testpackageroot" />
 	      </or></not>
 	    </condition>
@@ -407,15 +405,9 @@
 	      <batchtest fork="yes" todir="@{junit.output.dir}" if="runall">
 	        <fileset dir="@{dataDir}" includes="${junit.includes}" excludes="${junit.excludes}"/>
 	      </batchtest>
-      <batchtest fork="yes" todir="@{junit.output.dir}" if="testpackage">
-        <fileset dir="@{dataDir}" includes="**/${testpackage}/**/Test*.java,**/${testpackage}/**/*Test.java" excludes="${junit.excludes}"/>
-      </batchtest>
-       <batchtest fork="yes" todir="@{junit.output.dir}" if="testpackagea">
-         <fileset dir="@{dataDir}" includes=" **/${testpackagea}/**/TestA*.java **/${testpackagea}/**/A*Test.java **/${testpackagea}/**/TestB*.java **/${testpackagea}/**/B*Test.java **/${testpackagea}/**/TestC*.java **/${testpackagea}/**/C*Test.java **/${testpackagea}/**/TestD*.java **/${testpackagea}/**/D*Test.java **/${testpackagea}/**/TestE*.java **/${testpackagea}/**/E*Test.java **/${testpackagea}/**/TestF*.java **/${testpackagea}/**/F*Test.java **/${testpackagea}/**/TestG*.java **/${testpackagea}/**/G*Test.java **/${testpackagea}/**/TestH*.java **/${testpackagea}/**/H*Test.java **/${testpackagea}/**/TestI*.java **/${testpackagea}/**/I*Test.java **/${testpackagea}/**/TestJ*.java **/${testpackagea}/**/J*Test.java **/${testpackagea}/**/TestK*.java **/${testpackagea}/**/K*Test.java **/${testpackagea}/**/TestL*.java **/${testpackagea}/**/L*Test.java" excludes="${junit.excludes}"/>
-       </batchtest>
-       <batchtest fork="yes" todir="@{junit.output.dir}" if="testpackageb">
-         <fileset dir="@{dataDir}" includes=" **/${testpackageb}/**/TestM*.java **/${testpackageb}/**/M*Test.java **/${testpackageb}/**/TestN*.java **/${testpackageb}/**/N*Test.java **/${testpackageb}/**/TestO*.java **/${testpackageb}/**/O*Test.java **/${testpackageb}/**/TestP*.java **/${testpackageb}/**/P*Test.java **/${testpackageb}/**/TestQ*.java **/${testpackageb}/**/Q*Test.java **/${testpackageb}/**/TestR*.java **/${testpackageb}/**/R*Test.java **/${testpackageb}/**/TestS*.java **/${testpackageb}/**/S*Test.java **/${testpackageb}/**/TestT*.java **/${testpackageb}/**/T*Test.java **/${testpackageb}/**/TestU*.java **/${testpackageb}/**/U*Test.java **/${testpackageb}/**/TestV*.java **/${testpackageb}/**/V*Test.java **/${testpackageb}/**/TestW*.java **/${testpackageb}/**/W*Test.java **/${testpackageb}/**/TestX*.java **/${testpackageb}/**/X*Test.java **/${testpackageb}/**/TestY*.java **/${testpackageb}/**/Y*Test.java **/${testpackageb}/**/TestZ*.java **/${testpackageb}/**/Z*Test.java" excludes="${junit.excludes}"/>
-       </batchtest>
+	      <batchtest fork="yes" todir="@{junit.output.dir}" if="testpackage">
+	        <fileset dir="@{dataDir}" includes="**/${testpackage}/**/Test*.java,**/${testpackage}/**/*Test.java" excludes="${junit.excludes}"/>
+	      </batchtest>
 	      <batchtest fork="yes" todir="@{junit.output.dir}" if="testpackageroot">
 	        <fileset dir="@{dataDir}" includes="**/${testpackageroot}/Test*.java,**/${testpackageroot}/*Test.java" excludes="${junit.excludes}"/>
 	      </batchtest>
@@ -432,7 +424,7 @@
   	</sequential>
   </macrodef>
 	
-  <target name="test" description="Runs unit tests">
+  <target name="test" depends="compile-test" description="Runs unit tests">
     <test-macro dataDir="src/test" tempDir="${build.dir}/test">
     	<contrib-settings>
 	      <!-- set as a system property so contrib tests can have a fixed root

contrib/contrib-build.xml

@@ -61,8 +61,7 @@
   </target>
 
   
-  <!--<target name="init" depends="common.init,build-lucene,build-lucene-tests"/>-->
-  <target name="init"/>
+  <target name="init" depends="common.init,build-lucene,build-lucene-tests"/>
   <target name="compile-test" depends="init" if="contrib.has.tests">
     <antcall target="common.compile-test" inheritRefs="true" />
   </target>