You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by br...@apache.org on 2009/12/17 20:31:21 UTC
svn commit: r891856 - in /hadoop/zookeeper/trunk/src/contrib:
bookkeeper/build.xml build-contrib.xml
Author: breed
Date: Thu Dec 17 19:31:21 2009
New Revision: 891856
URL: http://svn.apache.org/viewvc?rev=891856&view=rev
Log:
ZOOKEEPER-623. ClientBase in bookkeeper.util requires junit
Modified:
hadoop/zookeeper/trunk/src/contrib/bookkeeper/build.xml
hadoop/zookeeper/trunk/src/contrib/build-contrib.xml
Modified: hadoop/zookeeper/trunk/src/contrib/bookkeeper/build.xml
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/bookkeeper/build.xml?rev=891856&r1=891855&r2=891856&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/bookkeeper/build.xml (original)
+++ hadoop/zookeeper/trunk/src/contrib/bookkeeper/build.xml Thu Dec 17 19:31:21 2009
@@ -60,7 +60,7 @@
<target name="compile" depends="ivy-retrieve,zookeeperbuildcontrib.compile"/>
- <target name="test" depends="compile-test,test-init,test-category,junit.run" />
+ <target name="test" depends="checkMainTestCompiled,compile-test,test-init,test-category,junit.run" />
<target name="compile-test" depends="ivy-retrieve-test,compile">
<property name="target.jdk" value="${ant.java.version}" />
@@ -71,6 +71,9 @@
target="${target.jdk}"
debug="on" >
<classpath refid="classpath" />
+ <classpath>
+ <pathelement location="${zk.root}/build/test/classes"/>
+ </classpath>
</javac>
</target>
@@ -104,6 +107,7 @@
<classpath refid="classpath"/>
<classpath>
<pathelement path="${build.test}" />
+ <pathelement location="${zk.root}/build/test/classes"/>
</classpath>
<formatter type="${test.junit.output.format}" />
<batchtest todir="${test.log.dir}" unless="testcase">
Modified: hadoop/zookeeper/trunk/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/build-contrib.xml?rev=891856&r1=891855&r2=891856&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/build-contrib.xml (original)
+++ hadoop/zookeeper/trunk/src/contrib/build-contrib.xml Thu Dec 17 19:31:21 2009
@@ -163,6 +163,16 @@
</target>
+ <target name="checkMainTestIsAvailable">
+ <available file="${zk.root}/build/test/classes/org/apache/zookeeper/test/ClientBase.class"
+ property="mainTestIsCompiled">
+ </available>
+ </target>
+
+ <target name="checkMainTestCompiled" unless="mainTestIsCompiled" depends="checkMainTestIsAvailable">
+ <fail message="ZooKeeper test must first be compiled (toplevel build.xml) using 'ant compile-test'"/>
+ </target>
+
<!-- ====================================================== -->
<!-- Ivy -->
<!-- ====================================================== -->