You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by jc...@apache.org on 2009/04/17 19:52:00 UTC
svn commit: r766099 - in /incubator/river/jtsk/skunk/jcosters: build.xml
qa/build.xml
Author: jcosters
Date: Fri Apr 17 17:52:00 2009
New Revision: 766099
URL: http://svn.apache.org/viewvc?rev=766099&view=rev
Log:
Add targets to run either specific tests or complete test categories.
Modified:
incubator/river/jtsk/skunk/jcosters/build.xml
incubator/river/jtsk/skunk/jcosters/qa/build.xml
Modified: incubator/river/jtsk/skunk/jcosters/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/jcosters/build.xml?rev=766099&r1=766098&r2=766099&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/jcosters/build.xml (original)
+++ incubator/river/jtsk/skunk/jcosters/build.xml Fri Apr 17 17:52:00 2009
@@ -2275,7 +2275,9 @@
-->
<target name="qa.run" depends="" description="Run QA tests">
<!-- Call qa subcomponent build -->
- <ant dir="qa" target="run" inheritall="false"/>
+ <ant dir="qa" target="run-categories" inheritall="false">
+ <property name="run.categories" value="joinmanager"/>
+ </ant>
</target>
<target name="all" depends="all.jars,configentry,all.doc"
Modified: incubator/river/jtsk/skunk/jcosters/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/jcosters/qa/build.xml?rev=766099&r1=766098&r2=766099&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/jcosters/qa/build.xml (original)
+++ incubator/river/jtsk/skunk/jcosters/qa/build.xml Fri Apr 17 17:52:00 2009
@@ -61,6 +61,21 @@
<pathelement location="${river.home}/tools/asm-3.1.jar"/>
<pathelement location="${river.home}/tools/asm-commons-3.1.jar"/>
</path>
+
+ <path id="ext.dirs.path">
+ <pathelement path="${java.ext.dirs}" />
+ <pathelement path="${lib-ext.dir}" />
+ <pathelement path="${river.lib-ext.dir}" />
+ </path>
+
+ <property name="ext.dirs" refid="ext.dirs.path" />
+ <property name="log.config" location="${src.dir}/com/sun/jini/test/resources/qa1.logging" />
+ <property name="security.policy" location="harness/policy/qa.policy" />
+ <!--possible values: jrmp,jeri,jsse,http,https,kerberos,none -->
+ <!--<property name="harness.configs" value="http,jrmp,jeri"/>-->
+ <property name="harness.configs" value="none"/>
+ <!-- possible values: activatable,transient -->
+ <property name="harness.servicemode" value="activatable"/>
<!-- resources to copy to classes dir -->
<property name="resources" value="**/resources/**, **/*.td, **/*.properties,
@@ -112,59 +127,63 @@
<classpath refid="river.classpath"/>
</javac-cmd>
</target>
-
- <target name="run" depends="" description="Execute the QA tests">
- <path id="ext.dirs.path">
- <pathelement path="${java.ext.dirs}" />
- <pathelement path="${lib-ext.dir}" />
- <pathelement path="${river.lib-ext.dir}" />
- </path>
- <property name="ext.dirs" refid="ext.dirs.path" />
- <property name="log.config" location="${src.dir}/com/sun/jini/test/resources/qa1.logging" />
- <property name="security.policy" location="harness/policy/qa.policy" />
- <!--possible values: jrmp,jeri,jsse,http,https,kerberos,none -->
- <!--<property name="harness.configs" value="http,jrmp,jeri"/>-->
- <property name="harness.configs" value="none"/>
- <!-- possible values: activatable,transient -->
- <property name="harness.servicemode" value="activatable"/>
- <!-- categories can be found under packages com.sun.jini.test.impl and com.sun.jini.test.spec, some of them: -->
- <!--<property name="test.categories" value="id,loader,policyprovider,locatordiscovery,activation,config,constraint,discoverymanager,discoveryservice,joinmanager,url,eventmailbox,jeri,iiop,jrmp,reliability,scalability,thread,renewalservice"/>-->
- <property name="test.categories" value="joinmanager"/>
- <java classname="com.sun.jini.qa.harness.QARunner" fork="yes" >
- <!-- JDK extension directories (include our lib-ext dirs, for the custom policy providers) -->
- <jvmarg value="-Djava.ext.dirs=${ext.dirs}" />
- <jvmarg value="-Djava.security.policy=${security.policy}" />
- <!--<jvmarg value="-Djava.security.debug=access" />-->
- <jvmarg value="-Djava.util.logging.config.file=${log.config}" />
- <jvmarg value="-Dcom.sun.jini.jsk.home=${river.home}" />
- <jvmarg value="-Dcom.sun.jini.qa.home=${basedir}" />
- <jvmarg value="-Dcom.sun.jini.test.home=${basedir}" />
- <jvmarg value="-Dcom.sun.jini.qa.harness.configs=${harness.configs}" />
- <!-- VM args for each test run: include our JDK extension directories
- $${com.sun.jini.qa.harness.globalvmargs},-Dcom.sun.jini.test.home=$${com.sun.jini.test.home},-Dcom.sun.jini.test.port=$${com.sun.jini.test.port},-Dcom.sun.jini.qa.harness.policies=<url: com/sun/jini/test/resources/jinitest.policy>-Djava.security.debug=access-->
- <jvmarg value="-Dcom.sun.jini.qa.harness.globalvmargs=$${com.sun.jini.qa.harness.globalvmargs},-Djava.ext.dirs=${ext.dirs}"/>
- <arg path="${src.dir}/com/sun/jini/test/resources/qaHarness.prop" />
- <arg value="-testJar"/>
- <arg path="${lib.dir}/jinitests.jar" />
+
+ <macrodef name="testrun">
+ <element name="tr-elements" optional="true" implicit="true"/>
+ <sequential>
+ <java classname="com.sun.jini.qa.harness.QARunner" fork="yes" >
+ <!-- JDK extension directories (include our lib-ext dirs, for the custom policy providers) -->
+ <jvmarg value="-Djava.ext.dirs=${ext.dirs}" />
+ <jvmarg value="-Djava.security.policy=${security.policy}" />
+ <!--<jvmarg value="-Djava.security.debug=access" />-->
+ <jvmarg value="-Djava.util.logging.config.file=${log.config}" />
+ <jvmarg value="-Dcom.sun.jini.jsk.home=${river.home}" />
+ <jvmarg value="-Dcom.sun.jini.qa.home=${basedir}" />
+ <jvmarg value="-Dcom.sun.jini.test.home=${basedir}" />
+ <jvmarg value="-Dcom.sun.jini.qa.harness.configs=${harness.configs}" />
+ <!-- VM args for each test run: include our JDK extension directories
+ $${com.sun.jini.qa.harness.globalvmargs},-Dcom.sun.jini.test.home=$${com.sun.jini.test.home},-Dcom.sun.jini.test.port=$${com.sun.jini.test.port},-Dcom.sun.jini.qa.harness.policies=<url: com/sun/jini/test/resources/jinitest.policy>-Djava.security.debug=access-->
+ <jvmarg value="-Dcom.sun.jini.qa.harness.globalvmargs=$${com.sun.jini.qa.harness.globalvmargs},-Djava.ext.dirs=${ext.dirs}"/>
+ <arg path="${src.dir}/com/sun/jini/test/resources/qaHarness.prop" />
+ <arg value="-testJar"/>
+ <arg path="${lib.dir}/jinitests.jar" />
+ <!-- Run harness in transient or activatable mode -->
+ <arg value="-com.sun.jini.qa.harness.serviceMode"/>
+ <arg value="${harness.servicemode}" />
+ <tr-elements/>
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="jiniharness.jar"/>
+ </fileset>
+ <fileset dir="${river.lib.dir}">
+ <include name="jsk-platform.jar"/>
+ <include name="jsk-lib.jar"/>
+ </fileset>
+ </classpath>
+ </java>
+ </sequential>
+ </macrodef>
+
+ <target name="run-tests" depends="" description="Execute specific QA test(s)">
+ <property name="run.tests" value="com/sun/jini/test/impl/discoverymanager/RemoveGroupsLocsDiscard.td"/>
+ <testrun>
<!-- Run specific test(s) -->
- <!--<arg value="-tests"/>
- <arg value="com/sun/jini/test/impl/discoverymanager/RemoveGroupsLocsDiscard.td" />-->
- <!-- Run one or more test categories -->
+ <arg value="-tests"/>
+ <arg value="${run.tests}" />
+ </testrun>
+ </target>
+
+ <target name="run-categories" depends="" description="Execute QA test categories">
+ <!-- categories can be found under packages com.sun.jini.test.impl and com.sun.jini.test.spec, some of them: -->
+ <!--<property name="test.categories" value="id,loader,policyprovider,locatordiscovery,activation,
+ config,constraint,discoverymanager,discoveryservice,joinmanager,url,
+ eventmailbox,jeri,iiop,jrmp,reliability,scalability,thread,renewalservice"/>-->
+ <property name="run.categories" value="joinmanager"/>
+ <testrun>
+ <!-- Run one or more test categories -->
<arg value="-categories"/>
- <arg value="${test.categories}"/>
- <!-- Run harness in transient or activatable mode -->
- <arg value="-com.sun.jini.qa.harness.serviceMode"/>
- <arg value="${harness.servicemode}" />
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="jiniharness.jar"/>
- </fileset>
- <fileset dir="${river.lib.dir}">
- <include name="jsk-platform.jar"/>
- <include name="jsk-lib.jar"/>
- </fileset>
- </classpath>
- </java>
+ <arg value="${run.categories}" />
+ </testrun>
</target>
<target name="doc" depends="compile"