You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/04/15 18:53:35 UTC
svn commit: r1326376 - in /lucene/dev/trunk/lucene: build.xml
common-build.xml
Author: rmuir
Date: Sun Apr 15 16:53:34 2012
New Revision: 1326376
URL: http://svn.apache.org/viewvc?rev=1326376&view=rev
Log:
LUCENE-3989: junit4 taskdef installation has wrong dependencies
Modified:
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/common-build.xml
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1326376&r1=1326375&r2=1326376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Sun Apr 15 16:53:34 2012
@@ -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/>
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1326376&r1=1326375&r2=1326376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Sun Apr 15 16:53:34 2012
@@ -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 - pe
</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>