Update of /var/cvs/tests
In directory james.mmbase.org:/tmp/cvs-serv16327

Modified Files:
        build.xml Makefile 
Log Message:
added 'rmmciutil' tests, which are like the normal util tests,  but performed 
with only the rmmci-client jar


See also: http://cvs.mmbase.org/viewcvs/tests


Index: build.xml
===================================================================
RCS file: /var/cvs/tests/build.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- build.xml   27 Apr 2009 16:06:02 -0000      1.82
+++ build.xml   30 Apr 2009 18:58:36 -0000      1.83
@@ -262,6 +262,19 @@
     </java>
   </target>
 
+  <target name="run.rmmciutil" depends="init" description="Various tests on 
utitilies (org.mmbase.util)">
+    <java
+        classname="${ui.class}"
+        fork="true"
+        timeout="300000"
+        classpathref="run.rmmci.client">
+      <arg value="org.mmbase.util.RmmciUtilTests" />
+      <jvmarg value="-Dmmbase.config=${tests.source.dir}/config" />
+      <jvmarg value="-Duser.dir=${tests.work.dir}" />
+      <assertions><enable /></assertions>
+    </java>
+  </target>
+
 
   <target name="run.datatypes" depends="init" description="Various tests on 
org.mmbase.datatypes">
     <java
@@ -411,14 +424,19 @@
   <target name="run.all" description="Run all tests">
     <echo 
message="========================================DBSQ========================================"
 />
     <antcall target="run.dbsq" inheritRefs="true"/>
+    <echo message="sleeping.." />
     <sleep seconds="10" />
     <echo 
message="========================================TYPEREL========================================"
 />
     <antcall target="run.typerel" inheritRefs="true"/>
+    <echo message="sleeping.." />
     <sleep seconds="10" />
     <antcall target="run.all.bridge" inheritRefs="true"/>
+    <echo message="sleeping.." />
     <sleep seconds="10" />
     <echo 
message="========================================UTIL========================================"
 />
     <antcall target="run.util" inheritRefs="true"/>
+    <echo message="========================================RMMCI 
UTIL========================================" />
+    <antcall target="run.rmmciutil" inheritRefs="true"/>
     <echo 
message="========================================DATATYPES========================================"
 />
     <antcall target="run.datatypes" inheritRefs="true"/>
     <sleep seconds="10" />
@@ -437,6 +455,7 @@
   <target name="run.all.bridge">
     <echo 
message="========================================BRIDGE========================================"
 />
     <antcall target="run.bridge" inheritRefs="true" />
+    <echo message="sleeping.." />
     <sleep seconds="10" />
     <echo 
message="========================================RMMCI========================================"
 />
     <antcall target="run.bridge.rmmci" inheritRefs="true" />
@@ -446,6 +465,7 @@
     <echo 
message="========================================RMMCI========================================"
 />
     <antcall target="run.bridge.rmmci" inheritRefs="true"/>
     <echo 
message="========================================CLUSTERING========================================"
 />
+    <echo message="sleeping.." />
     <sleep seconds="10" />
     <antcall target="run.clustering" inheritRefs="true"/>
   </target>


Index: Makefile
===================================================================
RCS file: /var/cvs/tests/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Makefile    27 Apr 2009 15:17:58 -0000      1.11
+++ Makefile    30 Apr 2009 18:58:36 -0000      1.12
@@ -1,12 +1,12 @@
 
-export JAVA_HOME=/opt/jdk15
+export JAVA_HOME=/opt/jdk16
 
 ant=ant -quiet -listener org.apache.tools.ant.listener.Log4jListener -lib 
lib:. -Dnoconnection=true
 #ant=ant -lib lib:. -Dnoconnection=true
 
 .PHONY: all bridge rmmci dbsq util datatypes clustering convert typerel 
richtext cloudcontext transactions
 all:
-       $(ant) run.all
+       $(ant) run.all | tee work/all.log
 
 #ok
 bridge: dependencies
@@ -26,9 +26,13 @@
        $(ant) run.dbsq | tee work/dbsq.log
 
 #ok
-util:
+util: dependencies
        $(ant) run.util | tee work/util.log
 
+
+rmmciutil: dependencies
+       $(ant) run.rmmciutil | tee work/rmmciutil.log
+
 #ok
 datatypes: dependencies
        $(ant) run.datatypes | tee work/datatypes.log
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to