Update of /var/cvs/tests
In directory james.mmbase.org:/tmp/cvs-serv16421
Modified Files:
build.xml
Log Message:
i hate ant
See also: http://cvs.mmbase.org/viewcvs/tests
Index: build.xml
===================================================================
RCS file: /var/cvs/tests/build.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- build.xml 25 Jul 2008 13:26:55 -0000 1.58
+++ build.xml 25 Jul 2008 16:16:41 -0000 1.59
@@ -31,7 +31,7 @@
<property name="mmbasetest.jar" value="${tests.lib}/mmbase-test.jar" />
<property name="ui.class" value="junit.textui.TestRunner" />
-
+ <property name="output" location="results.log" />
<import file="../install-dependency.xml" />
@@ -91,12 +91,12 @@
</target>
<target name="init" unless="inited">
- <antcall target="download" />
+ <antcall target="download" inheritRefs="true"/>
<mkdir dir="${tests.lib}" />
<mkdir dir="${tests.work.dir}"/>
- <echo message="mmbase version ${version}" />
+ <echo message="Initing. Testing mbase version ${version}" />
<available property="dummy" classname="dummy">
<classpath id="compile.classpath">
@@ -162,7 +162,7 @@
- <target name="compile" description="Compile the source directory"
depends="init">
+ <target name="compile" description="Compile the source directory"
depends="init" unless="compiled">
<mkdir dir="${tests.build.dir}/classes"/>
@@ -247,6 +247,7 @@
<src path="${tests.source.dir}/releasestrategy"/>
<include name="**/*.java"/>
</javac>
+ <property name="compiled" value="yes" />
</target>
@@ -254,11 +255,11 @@
<uptodate property="jar.uptodate" targetfile="${mmbasetest.jar}" >
<srcfiles dir="${tests.source.dir}" includes="**/*"
excludes="build/**,work/**,lib/**,build.xml" />
</uptodate>
- <echo message="up to date: ${jar.uptodate}" />
+ <echo level="debug" message="up to date: ${jar.uptodate}" />
</target>
<target name="jar.check" depends="jar.uptodatecheck" if="jar.uptodate">
- <echo message="${mmbasetest.jar} is up-to-date" />
+ <echo level="debug" message="${mmbasetest.jar} is up-to-date" />
</target>
@@ -288,7 +289,7 @@
<target name="run.typerel" depends="jar,init" description="Allowed Relations
tests">
- <antcall target="clean.database" />
+ <antcall target="clean.database" inheritRefs="true" />
<java
classname="${ui.class}"
fork="true"
@@ -298,12 +299,19 @@
<jvmarg value="-Dmmbase.config=${tests.source.dir}/config" />
<jvmarg value="-Duser.dir=${tests.work.dir}" />
<assertions><enable /></assertions>
+ <redirector
+ output="${output}"
+ append="true"
+ alwayslog="true"
+ />
</java>
</target>
<target name="run.releasestrategy" depends="jar,init" description="Query
Result Release Strategy tests">
<antcall target="clean.database" />
<java
+ output="${output}"
+ append="true"
classname="${ui.class}"
fork="true"
classpathref="run.classpath"
@@ -320,6 +328,8 @@
<antcall target="clean.database" />
<echo message="Starting ${ui.class}: " />
<java
+ output="${output}"
+ append="true"
classname="${ui.class}"
fork="true"
classpathref="run.classpath"
@@ -349,6 +359,8 @@
</daemons>
<echo message="starting client" />
<java
+ output="${output}"
+ append="true"
classname="${ui.class}"
fork="true"
classpathref="run.rmmci.client"
@@ -359,12 +371,14 @@
<assertions><enable /></assertions>
</java>
</parallel>
- <antcall target="stop.database" />
+ <antcall target="stop.database" inheritRefs="true" />
</target>
<target name="run.convertimage" depends="jar,init" description="Image
conversion tests">
<java
+ output="${output}"
+ append="true"
classname="${ui.class}"
fork="true"
classpathref="run.classpath"
@@ -378,8 +392,10 @@
<target name="run.dbsq" depends="jar,init" description="SearchQuery tests">
- <antcall target="clean.database" />
+ <antcall target="clean.database" inheritRefs="true"/>
<java
+ output="${output}"
+ append="true"
classname="${ui.class}"
fork="true"
classpathref="run.classpath"
@@ -393,6 +409,8 @@
<target name="run.util" depends="init,jar" description="Various tests on
utitilies (org.mmbase.util)">
<java
+ output="${output}"
+ append="true"
classname="${ui.class}"
fork="true"
classpathref="run.classpath">
@@ -404,11 +422,11 @@
</target>
<target name="run.clustering" depends="jar,init" description="Clustering
test-cases (Starts 2 mmbases, communicates with RMMCI)">
- <antcall target="clean.database" />
+ <antcall target="clean.database" inheritRefs="true"/>
<parallel>
<echo message="${tests.source.dir}/config" />
<daemons>
- <antcall target="start.database" />
+ <antcall target="start.database" inheritRefs="true"/>
<java
classname="org.mmbase.tests.MMBaseTest"
fork="true"
@@ -445,12 +463,14 @@
<sequential>
<sleep seconds="40" />
<java
+ output="${output}"
+ append="true"
classname="${ui.class}"
fork="true"
classpathref="run.rmmci.client">
<arg value="org.mmbase.tests.Clustering" />
</java>
- <antcall target="stop.database" />
+ <antcall target="stop.database" inheritRefs="true"/>
</sequential>
</parallel>
</target>
@@ -475,36 +495,36 @@
<!-- =================================================================== -->
<target name="run.all" description="Run all tests">
<echo
message="========================================DBSQ========================================"
/>
- <antcall target="run.dbsq" />
+ <antcall target="run.dbsq" inheritRefs="true"/>
<sleep seconds="10" />
<echo
message="========================================TYPEREL========================================"
/>
- <antcall target="run.typerel" />
+ <antcall target="run.typerel" inheritRefs="true"/>
<sleep seconds="10" />
<echo
message="========================================BRIDGE========================================"
/>
- <antcall target="run.bridge" />
+ <antcall target="run.bridge" inheritRefs="true"/>
<sleep seconds="10" />
<echo
message="========================================RMMCI========================================"
/>
- <antcall target="run.bridge.rmmci" />
+ <antcall target="run.bridge.rmmci" inheritRefs="true"/>
<sleep seconds="10" />
<echo
message="========================================UTIL========================================"
/>
- <antcall target="run.util" />
+ <antcall target="run.util" inheritRefs="true"/>
<sleep seconds="10" />
<echo
message="========================================CLUSTERING========================================"
/>
- <antcall target="run.clustering" />
+ <antcall target="run.clustering" inheritRefs="true"/>
<sleep seconds="10" />
<echo
message="========================================RELEASESTRATEGY========================================"
/>
- <antcall target="run.releasestrategy" />
+ <antcall target="run.releasestrategy" inheritRefs="true"/>
<sleep seconds="10" />
<echo
message="========================================CONVERTIMAGE========================================"
/>
- <antcall target="run.convertimage" />
+ <antcall target="run.convertimage" inheritRefs="true"/>
</target>
<target name="run.test">
<echo
message="========================================RMMCI========================================"
/>
- <antcall target="run.bridge.rmmci" />
+ <antcall target="run.bridge.rmmci" inheritRefs="true"/>
<echo
message="========================================CLUSTERING========================================"
/>
<sleep seconds="10" />
- <antcall target="run.clustering" />
+ <antcall target="run.clustering" inheritRefs="true"/>
</target>
<target name="run.database">
@@ -525,7 +545,7 @@
</daemons>
</parallel>
<sleep seconds="10" />
- <antcall target="stop.database" />
+ <antcall target="stop.database" inheritRefs="true"/>
<sleep seconds="10" />
</target>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
