Update of /var/cvs/tests
In directory james.mmbase.org:/tmp/cvs-serv2816
Modified Files:
build.xml
Log Message:
this stuff with output is a bit annoying after all. Also because it is
impossible to set it to stdout. Ant sucks.
See also: http://cvs.mmbase.org/viewcvs/tests
Index: build.xml
===================================================================
RCS file: /var/cvs/tests/build.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- build.xml 25 Jul 2008 16:16:41 -0000 1.59
+++ build.xml 29 Jul 2008 06:57:08 -0000 1.60
@@ -31,8 +31,6 @@
<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" />
<target name="clean.database">
@@ -299,19 +297,12 @@
<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"
@@ -328,8 +319,6 @@
<antcall target="clean.database" />
<echo message="Starting ${ui.class}: " />
<java
- output="${output}"
- append="true"
classname="${ui.class}"
fork="true"
classpathref="run.classpath"
@@ -359,8 +348,6 @@
</daemons>
<echo message="starting client" />
<java
- output="${output}"
- append="true"
classname="${ui.class}"
fork="true"
classpathref="run.rmmci.client"
@@ -377,8 +364,6 @@
<target name="run.convertimage" depends="jar,init" description="Image
conversion tests">
<java
- output="${output}"
- append="true"
classname="${ui.class}"
fork="true"
classpathref="run.classpath"
@@ -394,8 +379,6 @@
<target name="run.dbsq" depends="jar,init" description="SearchQuery tests">
<antcall target="clean.database" inheritRefs="true"/>
<java
- output="${output}"
- append="true"
classname="${ui.class}"
fork="true"
classpathref="run.classpath"
@@ -409,8 +392,6 @@
<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">
@@ -463,8 +444,6 @@
<sequential>
<sleep seconds="40" />
<java
- output="${output}"
- append="true"
classname="${ui.class}"
fork="true"
classpathref="run.rmmci.client">
@@ -500,11 +479,7 @@
<echo
message="========================================TYPEREL========================================"
/>
<antcall target="run.typerel" inheritRefs="true"/>
<sleep seconds="10" />
- <echo
message="========================================BRIDGE========================================"
/>
- <antcall target="run.bridge" inheritRefs="true"/>
- <sleep seconds="10" />
- <echo
message="========================================RMMCI========================================"
/>
- <antcall target="run.bridge.rmmci" inheritRefs="true"/>
+ <antcall target="run.all.bridge" />
<sleep seconds="10" />
<echo
message="========================================UTIL========================================"
/>
<antcall target="run.util" inheritRefs="true"/>
@@ -519,7 +494,15 @@
<antcall target="run.convertimage" inheritRefs="true"/>
</target>
- <target name="run.test">
+ <target name="run.all.bridge">
+ <echo
message="========================================BRIDGE========================================"
/>
+ <antcall target="run.bridge" inheritRefs="true" />
+ <sleep seconds="10" />
+ <echo
message="========================================RMMCI========================================"
/>
+ <antcall target="run.bridge.rmmci" inheritRefs="true" />
+ </target>
+
+ <target name="run.all.rmmci">
<echo
message="========================================RMMCI========================================"
/>
<antcall target="run.bridge.rmmci" inheritRefs="true"/>
<echo
message="========================================CLUSTERING========================================"
/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
