diff options
| author | mclarke <mclarke@unknown> | 2013-04-23 19:45:49 +0000 |
|---|---|---|
| committer | mclarke <mclarke@unknown> | 2013-04-23 19:45:49 +0000 |
| commit | 7a1aff605d0d7726e3d9ff03366f32bc4e5c7e7b (patch) | |
| tree | 5f4c156740fb67432aed0b4254132e74954d2371 /build.xml | |
| parent | 6af38183767fe6db8bcada1ad9d50a5f571c82f7 (diff) | |
| download | ant-7a1aff605d0d7726e3d9ff03366f32bc4e5c7e7b.tar.gz | |
Re-introduce JUnit3/JUnit4 split
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1471115 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 26 |
1 files changed, 24 insertions, 2 deletions
@@ -186,7 +186,22 @@ </selector> <selector id="needs.junit"> - <filename name="${optional.package}/junit/"/> + <and> + <filename name="${optional.package}/junit/"/> + <not> + <or> + <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/> + <filename name="${optional.package}/junit/CustomJUnit4TestAdapterCache*" /> + </or> + </not> + </and> + </selector> + + <selector id="needs.junit4"> + <or> + <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/> + <filename name="${optional.package}/junit/CustomJUnit4TestAdapterCache*" /> + </or> </selector> <selector id="needs.apache-regexp"> @@ -295,6 +310,7 @@ <selector refid="needs.jmf"/> <selector refid="needs.jsch"/> <selector refid="needs.junit"/> + <selector refid="needs.junit4"/> <selector refid="needs.netrexx"/> <selector refid="needs.swing"/> <selector refid="ant.launcher"/> @@ -368,6 +384,9 @@ classname="org.apache.xalan.trace.TraceListenerEx3" classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/> <available property="junit.present" + classname="junit.framework.TestCase" + classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/> + <available property="junit4.present" classname="org.junit.Test" classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/> <available property="antunit.present" @@ -548,7 +567,8 @@ <selector refid="not.in.kaffe" if="kaffe"/> <selector refid="needs.apache-resolver" unless="apache.resolver.present"/> - <selector refid="needs.junit" unless="junit.present"/> + <selector refid="needs.junit" unless="junit.present"/> <!-- XXX should perhaps use -source 1.4? --> + <selector refid="needs.junit4" unless="junit4.present"/> <selector refid="needs.apache-regexp" unless="apache.regexp.present"/> <selector refid="needs.apache-oro" unless="apache.oro.present"/> @@ -721,6 +741,7 @@ <optional-jar dep="apache-resolver"/> <optional-jar dep="junit"/> + <optional-jar dep="junit4"/> <optional-jar dep="apache-regexp"/> <optional-jar dep="apache-oro"/> <optional-jar dep="apache-bcel"/> @@ -813,6 +834,7 @@ <optional-src-jar dep="apache-resolver"/> <optional-src-jar dep="junit"/> + <optional-src-jar dep="junit4"/> <optional-src-jar dep="apache-regexp"/> <optional-src-jar dep="apache-oro"/> <optional-src-jar dep="apache-bcel"/> |