shuber 2005/07/26 14:58:42 CEST
Modified files:
core maven.xml
Log:
Changed method for launching cluster tests, which now allows for console
output.
Revision Changes Path
1.36 +37 -16 jahia/core/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/maven.xml.diff?r1=1.35&r2=1.36&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/maven.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- maven.xml 25 Jul 2005 18:12:40 -0000 1.35
+++ maven.xml 26 Jul 2005 12:58:42 -0000 1.36
@@ -189,29 +189,50 @@
<!-- Cluster tests launch goals -->
+ <!-- All these are not using test:single anymore because we had problems
displaying the console output, which is critical for these tests -->
- <goal name="jahia:testClusterCache1">
- <j:set var="maven.junit.usefile" value="false" />
- <j:set var="testcase"
value="org.jahia.services.cache.TestClusterCacheNode1" />
- <attainGoal name="test:single" />
+ <goal name="jahia:testClusterCache1" prereqs="test:compile">
+ <java classname="junit.textui.TestRunner" fork="yes">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${maven.build.dest}"/>
+ <pathelement path="${maven.test.dest}"/>
+ </classpath>
+ <arg value="org.jahia.services.cache.TestClusterCacheNode1" />
+ </java>
</goal>
- <goal name="jahia:testClusterCache2">
- <j:set var="maven.junit.usefile" value="false" />
- <j:set var="testcase"
value="org.jahia.services.cache.TestClusterCacheNode2" />
- <attainGoal name="test:single" />
+ <goal name="jahia:testClusterCache2" prereqs="test:compile">
+ <java classname="junit.textui.TestRunner" fork="yes">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${maven.build.dest}"/>
+ <pathelement path="${maven.test.dest}"/>
+ </classpath>
+ <arg value="org.jahia.services.cache.TestClusterCacheNode2" />
+ </java>
</goal>
- <goal name="jahia:testClusterService1">
- <j:set var="maven.junit.usefile" value="false" />
- <j:set var="testcase"
value="org.jahia.services.cluster.TestClusterServiceNode1" />
- <attainGoal name="test:single" />
+ <goal name="jahia:testClusterService1" prereqs="test:compile">
+ <java classname="junit.textui.TestRunner" fork="yes">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${maven.build.dest}"/>
+ <pathelement path="${maven.test.dest}"/>
+ </classpath>
+ <arg value="org.jahia.services.cluster.TestClusterServiceNode1" />
+ </java>
</goal>
- <goal name="jahia:testClusterService2">
- <j:set var="maven.junit.usefile" value="false" />
- <j:set var="testcase"
value="org.jahia.services.cluster.TestClusterServiceNode2" />
- <attainGoal name="test:single" />
+ <goal name="jahia:testClusterService2" prereqs="test:compile">
+ <java classname="junit.textui.TestRunner" fork="yes">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${maven.build.dest}"/>
+ <pathelement path="${maven.test.dest}"/>
+ </classpath>
+ <arg value="org.jahia.services.cluster.TestClusterServiceNode2" />
+ </java>
</goal>
</project>