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 2010/08/29 13:50:10 UTC
svn commit: r990570 - in /incubator/river/jtsk/trunk/qa: build.xml
src/com/sun/jini/test/resources/qaHarness.prop
Author: jcosters
Date: Sun Aug 29 11:50:10 2010
New Revision: 990570
URL: http://svn.apache.org/viewvc?rev=990570&view=rev
Log:
RIVER-333: rudimentary support to generate HTML reports for QA tests in qa/results
Modified:
incubator/river/jtsk/trunk/qa/build.xml
incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=990570&r1=990569&r2=990570&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Sun Aug 29 11:50:10 2010
@@ -34,7 +34,7 @@
<property name="trust.dir" location="harness/trust"/>
<!-- javadoc setings -->
- <property name="javadoc.doc-title" value="Apache River v${version} QA Harness and Test API Documentation"/>
+ <property name="javadoc.doc-title" value="${product.title} QA Harness and Test API Documentation"/>
<property name="javadoc.win-title" value="${javadoc.doc-title}"/>
<!-- jtreg environment setup -->
@@ -69,11 +69,16 @@
<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"/>-->
+ <!--possible values: any combination of jrmp,jeri,jsse,http,https,kerberos,none
+ default: none -->
<property name="harness.configs" value="none"/>
- <!-- possible values: activatable,transient -->
- <property name="harness.servicemode" value="transient"/>
+ <!-- possible values: activatable,transient,persistent
+ default: activatable -->
+ <property name="harness.servicemode" value="activatable"/>
+ <!-- enable this property if you want the QA harness to generate
+ HTML reports for each test in the qa/results directory -->
+ <property name="harness.generateHtml" value="false"/>
+ <property name="harness.generateHtml.title" value="${product.title} QA test results"/>
<!-- resources to copy to classes dir -->
<property name="resources" value="**/resources*/**, **/*.td, **/*.properties,
@@ -199,6 +204,8 @@
<delete file="${jtreg.dir}/test.props"/>
</target>
+
+
<macrodef name="testrun">
<element name="tr-elements" optional="true" implicit="true"/>
<sequential>
@@ -210,7 +217,6 @@
<!-- JDK extension directories (include our lib-ext dirs, for the custom policy providers) -->
<!--<jvmarg value="-Xbootclasspath/a:${river-ext.lib-dir}"/>-->
<jvmarg value="-Djava.ext.dirs=${ext.dirs}"/>
- <jvmarg value="-Djava.util.logging.manager=com.sun.jini.logging.LogManager"/>
<!--Use the following security manager if you need to discover which jar
file requires a particular permission, note this only works for the harness here -->
<!--<jvmarg value="-Djava.security.manager=com.sun.jini.tool.ProfilingSecurityManager"/>-->
@@ -220,6 +226,7 @@
<jvmarg value="-Djava.security.policy=${security.policy}" />
<!--<jvmarg value="-Djava.security.debug=access" />-->
<jvmarg value="-Djava.util.logging.config.file=${log.config}" />
+ <jvmarg value="-Djava.util.logging.manager=com.sun.jini.logging.LogManager"/>
<jvmarg value="-Dcom.sun.jini.jsk.home=${river.home}" />
<jvmarg value="-Dcom.sun.jini.qa.home=${basedir}" />
<!--We have a problem with path to properties and the src directory
@@ -228,9 +235,10 @@
the path to those property files in jar archives needs looking into
this is now solved by setting the -->
<jvmarg value="-Dcom.sun.jini.test.home=${basedir}" />
- <!--<jvmarg value="-DsearchPath=${basedir}/src,${basedir},${searchPath}"/>-->
<jvmarg value="-Dcom.sun.jini.qa.harness.harnessJar=${basedir}/lib/jiniharness.jar"/>
<jvmarg value="-Dcom.sun.jini.qa.harness.configs=${harness.configs}" />
+ <jvmarg value="-Dcom.sun.jini.qa.harness.generateHtml=${harness.generateHtml}" />
+ <jvmarg value="-Dcom.sun.jini.qa.harness.generateHtml.title=${harness.generateHtml.title}" />
<!-- 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},-Djava.security.debug=access"/>-->
@@ -238,7 +246,7 @@
<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 -->
+ <!-- Run harness in activatable (default), transient or persistent mode -->
<arg value="-com.sun.jini.qa.harness.serviceMode"/>
<arg value="${harness.servicemode}" />
<tr-elements/>
Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop?rev=990570&r1=990569&r2=990570&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop Sun Aug 29 11:50:10 2010
@@ -29,10 +29,10 @@
# com.sun.jini.jsk.home=${user.home}/river/jtsk/trunk
# Location of the harness installation
-# com.sun.jini.qa.home=${user.home}/river/qatests/trunk/source/vob/qa
+# com.sun.jini.qa.home=${user.home}/river/jtsk/trunk/qa
# Location of the tests installation
-# com.sun.jini.test.home=${user.home}/river/qatests/trunk/source/vob/qa
+# com.sun.jini.test.home=${user.home}/river/jtsk/trunk/qa
######################################################
#
@@ -172,13 +172,13 @@ com.sun.jini.qa.harness.timeout=0
com.sun.jini.qa.harness.configs=none
# current domain
-com.sun.jini.jsk.domain=east.sun.com
+com.sun.jini.jsk.domain=apache.org
# Generate an index.html results file and place each test result
# in a separate file
com.sun.jini.qa.harness.generateHtml=false
-com.sun.jini.qa.harness.generateHtml.resultLog=index.html
-com.sun.jini.qa.harness.generateHtml.title=
+com.sun.jini.qa.harness.generateHtml.resultLog=result$/index.html
+com.sun.jini.qa.harness.generateHtml.title=Apache River QA test results
com.sun.jini.qa.harness.generateHtml.links=qaHarness.prop logging.properties
com.sun.jini.qa.harness.generateHtml.removePassResults=false
com.sun.jini.qa.harness.generateHtml.testOrderJsp=http://jiniautot.east:8080/autot/ReloadTestOrder.jsp