From 815cc4f10e30e795406edcbfabe3381a359e60b4 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sun, 15 Apr 2012 16:53:34 +0000
Subject: [PATCH] LUCENE-3989: junit4 taskdef installation has wrong
 dependencies

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1326376 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/build.xml        |  2 +-
 lucene/common-build.xml | 26 ++++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/lucene/build.xml b/lucene/build.xml
index 2b8fab0f4e7..ef2fbe292ed 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -106,7 +106,7 @@
   Add dependency after 4.0: depends="compile-backwards, backwards-test-warning"
   and uncomment inside of this target.
   -->
-  <target name="test-backwards">
+  <target name="test-backwards" depends="install-junit4-taskdef">
     <!--
     <mkdir dir="${build.dir.backwards}/test"/>
     <backwards-test-macro/>
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 4b782721bdd..9e536c70d19 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -252,15 +252,7 @@
   </target>
 
   <target name="init" depends="resolve">
-    <!-- JUnit4 taskdef. -->
-    <taskdef resource="com/carrotsearch/junit4/antlib.xml">
-      <classpath>
-         <fileset dir="${common.dir}/test-framework/lib">
-            <include name="junit4-ant-*.jar" />
-            <include name="junit-*.jar" />
-         </fileset>
-      </classpath>
-    </taskdef>    
+    <!-- currently empty -->
   </target>
 
   <target name="resolve" depends="ivy-availability-check,ivy-fail">
@@ -928,7 +920,21 @@ ${tests-output}/junit4-*.suites     - per-JVM executed suites
       </echo>
   </target>
 
-  <target name="test" depends="compile-test,validate" description="Runs unit tests">
+  <target name="install-junit4-taskdef">
+    <!-- JUnit4 taskdef. -->
+    <taskdef resource="com/carrotsearch/junit4/antlib.xml">
+      <classpath>
+         <fileset dir="${common.dir}/test-framework/lib">
+            <include name="junit4-ant-*.jar" />
+            <include name="junit-*.jar" />
+         </fileset>
+      </classpath>
+    </taskdef>
+  </target>
+
+  <!-- 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="compile-test,install-junit4-taskdef,validate" description="Runs unit tests">
     <mkdir dir="${junit.output.dir}"/>
     <test-macro threadNum="${tests.threadspercpu}" />
   </target>