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/09/19 13:25:28 UTC
svn commit: r998631 - in /incubator/river/jtsk/trunk: build.xml qa/build.xml
Author: jcosters
Date: Sun Sep 19 11:25:28 2010
New Revision: 998631
URL: http://svn.apache.org/viewvc?rev=998631&view=rev
Log:
RIVER-333:
- add target collect-result to qa/build.xml, that will zip the QA test result HTML reports. This allows for Hudson to pick it up and archive it as a build artifact for every build attempt, as well as developer/testers to more easily send in their results
RIVER-301:
- move specification of default value for run.categories to qa/build.xml
- change call to qa.run-categories to qa.run, which also collects the HTML reports
- general cleanup
Modified:
incubator/river/jtsk/trunk/build.xml
incubator/river/jtsk/trunk/qa/build.xml
Modified: incubator/river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=998631&r1=998630&r2=998631&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Sun Sep 19 11:25:28 2010
@@ -306,21 +306,10 @@
<package name="net.jini.security"/>
<package name="net.jini.security.policy"/>
<package name="net.jini.security.proxytrust"/>
- <package name="org.apache.river.security"/>
- <package name="org.apache.river.imp.security.policy.se"/>
- <package name="org.apache.river.imp.security.policy.cdc"/>
- <package name="org.apache.river.imp.security.policy.spi"/>
- <package name="org.apache.river.imp.security.policy.util"/>
- <package name="org.apache.river.imp.util"/>
<package name="net.jini.space"/>
<package name="net.jini.url.file"/>
<package name="net.jini.url.httpmd"/>
<package name="net.jini.url.https"/>
- <package name="org.apache.river.api.security"/>
- <package name="org.apache.river.api.services.lease"/>
- <package name="org.apache.river.api.throwable.lease"/>
- <package name="org.apache.river.api.throwable.rmi"/>
- <package name="org.apache.river.api.util"/>
</javadoc>
<mkdir dir="${doc.api.dir}/doc-files"/>
<copy file="NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE"/>
@@ -382,12 +371,6 @@
<package name="net.jini.url.file"/>
<package name="net.jini.url.httpmd"/>
<package name="net.jini.url.https"/>
- <package name="org.apache.river.api.security"/>
- <package name="org.apache.river.api.services.lease"/>
- <package name="org.apache.river.api.throwable.lease"/>
- <package name="org.apache.river.api.throwable.rmi"/>
- <package name="org.apache.river.api.util"/>
-
</javadoc>
<mkdir dir="${doc.spec.api.dir}/doc-files"/>
<copy file="NOTICE" tofile="${doc.spec.api.dir}/doc-files/NOTICE"/>
@@ -593,7 +576,10 @@
includes="META-INF/services/com.sun.jini.tool.envcheck.Plugin"/>
</jar>
</target>
- <!-- Scheduled for removal -->
+
+ <!--
+ Deprecated since 2.1 - Scheduled for removal
+ -->
<target name="jini-core.jar" depends="stubs">
<delete file="${lib.dir}/jini-core.jar" quiet="true"/>
<jar destfile="${lib.dir}/jini-core.jar"
@@ -602,7 +588,10 @@
includes="net/jini/core/**"/>
</jar>
</target>
- <!-- Scheduled for removal -->
+
+ <!--
+ Deprecated since 2.1 - Scheduled for removal
+ -->
<target name="jini-ext.jar" depends="stubs">
<property name="jini-ext.deps" location="${build.deps.dir}/jini-ext.deps"/>
<classdep output="${jini-ext.deps}"
@@ -745,13 +734,6 @@
<arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
- <arg line="-in org.apache.river"/>
- <!--The following is left out to avoid multiple classes visible on
- the classpath, if the wrong jar is selected, it may not have
- the appropriate permission if it is outside the jre/lib/ext
- directory where AllPermission is granted-->
- <arg line="-out org.apache.river.imp.security.policy.se"/>
- <arg line="-out org.apache.river.imp.security.policy.util"/>
<arg path="${build.classes.dir}/net/jini/activation"/>
<arg path="${build.classes.dir}/net/jini/config"/>
<arg path="${build.classes.dir}/net/jini/constraint"/>
@@ -768,8 +750,6 @@
<arg path="${build.classes.dir}/org/apache/river/api"/>
<arg value="net.jini.discovery.ConstrainableLookupLocator"/>
<arg value="net.jini.discovery.ConstrainableLookupLocatorTrustVerifier"/>
- <!--<arg value="org.apache.river.api.security.RevokePermission"/>
- <arg value="org.apache.river.api.security.PermissionGrantBuilder"/>-->
<arg path="${build.classes.dir}/com/sun/jini/discovery"/>
<arg value="com.sun.jini.config.ConfigUtil"/>
<arg value="com.sun.jini.config.KeyStores"/>
@@ -825,11 +805,8 @@
<arg value="-files"/>
<arg value="net.jini.security.policy.DynamicPolicyProvider"/>
<arg value="net.jini.security.policy.PolicyFileProvider"/>
- <arg value="org.apache.river.api.security.RevokePermission"/>
- <arg value="org.apache.river.api.security.PermissionGrantBuilder"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
- <arg line="-in org.apache.river"/>
</classdep>
<delete file="${lib-ext.dir}/jsk-policy.jar" quiet="true"/>
<jar destfile="${lib-ext.dir}/jsk-policy.jar"
@@ -850,7 +827,11 @@
META-INF/services/net.jini.export.ServerContext$$Spi"/>
</jar>
</target>
- <!-- Scheduled for removal -->
+
+ <!--
+ Deprecated since 2.1 - Scheduled for removal
+ Note: the QA suite depends on some of the classes in sun-util.jar
+ -->
<target name="sun-util.jar" depends="stubs">
<property name="sun-util.deps" location="${build.deps.dir}/sun-util.deps"/>
<classdep output="${sun-util.deps}"
@@ -888,7 +869,10 @@
com/sun/jini/thread/**"/>
</jar>
</target>
-
+
+ <!--
+ Deprecated since 2.1 - Scheduled for removal
+ -->
<target name="sdm-dl.jar" depends="stubs">
<property name="sdm-dl.deps" location="${build.deps.dir}/sdm-dl.deps"/>
<classdep output="${sdm-dl.deps}">
@@ -2039,19 +2023,16 @@
</preferredlistgen>
</target>
- <!-- You can specify the following properties (see qa/build.xml):
+ <!-- You can specify the following properties (also see qa/build.xml):
run.categories
harness.configs
harness.servicemode
+ harness.generateHtml
e.g. ant -Dharness.servicemode=transient qa.run
-->
<target name="qa.run" depends="" description="Run QA tests">
- <property name="run.categories"
- value="id,loader,policyprovider,locatordiscovery,activation,config,discoverymanager,joinmanager,url,iiop,jrmp,reliability,thread,renewalmanager,constraint,export,lookupdiscovery,servicediscovery,io,security,lookupservice,renewalservice,eventmailbox,jeri,start,discoveryservice,discoveryproviders"/>
<!-- Call qa subcomponent build -->
- <ant dir="qa" target="run-categories" inheritall="false" >
- <property name="run.categories" value="${run.categories}" />
- </ant>
+ <ant dir="qa" target="run" inheritall="false"/>
</target>
<target name="build" depends="configentry,test,jars,doc,spec-doc"/>
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=998631&r1=998630&r2=998631&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Sun Sep 19 11:25:28 2010
@@ -32,6 +32,7 @@
<!-- directory settings -->
<property name="trust.dir" location="harness/trust"/>
+ <property name="result.dir" location="result"/>
<!-- javadoc setings -->
<property name="javadoc.doc-title" value="${product.title} QA Harness and Test API Documentation"/>
@@ -92,7 +93,7 @@
</target>
<target name="clean-result">
- <delete dir="${basedir}/result"/>
+ <delete dir="${result.dir}"/>
</target>
<target name="clean-build">
@@ -160,7 +161,6 @@
</filelist>
</move>
<move file="${river.lib-ext.dir}/jsk-policy.jar" todir="${jtreg.dir}/JTlib-tmp"/>
- <!--<move file="${river.lib-ext.dir}/concurrent-policy-util.jar" todir="${jtreg.dir}/JTlib-tmp"/>-->
<jtreg dir="${jtreg.dir}" verbose="all,nopass" failonerror="false"
errorproperty="jtreg.fail" failureproperty="jtreg.fail"
reportdir="${jtreg.dir}/JTreport" workdir="${jtreg.dir}/JTwork"
@@ -187,7 +187,6 @@
</filelist>
</move>
<move file="${jtreg.dir}/JTlib-tmp/jsk-policy.jar" todir="${river.lib-ext.dir}"/>
- <!--<move file="${jtreg.dir}/JTlib-tmp/concurrent-policy-util.jar" todir="${river.lib-ext.dir}"/>-->
<delete dir="${jtreg.dir}/JTlib-tmp"/>
<delete file="${jtreg.dir}/test.props"/>
<fail if="jtreg.fail"/>
@@ -204,13 +203,10 @@
</filelist>
</move>
<move file="${jtreg.dir}/JTlib-tmp/jsk-policy.jar" todir="${river.lib-ext.dir}"/>
- <!--<move file="${jtreg.dir}/JTlib-tmp/concurrent-policy-util.jar" todir="${river.lib-ext.dir}"/>-->
<delete dir="${jtreg.dir}/JTlib-tmp"/>
<delete file="${jtreg.dir}/test.props"/>
</target>
-
-
<macrodef name="testrun">
<element name="tr-elements" optional="true" implicit="true"/>
<sequential>
@@ -269,24 +265,7 @@
</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"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/impl/locatordiscovery/DelayDiscoveryAfterDiscard.td,com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoGetProperty.td,com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td,com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td,com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoGetProperty.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/policyprovider/policyFileProvider/NullPolicy.td"/>*pass*-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/joinmanager/GetDiscoveryManager.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/joinmanager/TerminateDiscovery.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/impl/joinmanager/ZRegisterStorm.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipalSame.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissionsSecurityException.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityExceptionHttpCann.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/NullCases.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/spec/policyprovider/revokableDynamicPolicyProvider/OptimisedPermissionCheck.td"/>-->
- <!--<property name="run.tests" value="com/sun/jini/test/impl/servicediscovery/event/DiscardDownReDiscover.td"/>-->
- <property name="run.tests" value="com/sun/jini/test/spec/servicediscovery/event/SetAttrServiceChanged.td"/>
- <!--<property name="run.tests" value=""/>-->
+ <property name="run.tests" value="com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td"/>
<testrun>
<!-- Run specific test(s) -->
<arg value="-tests"/>
@@ -294,15 +273,15 @@
</testrun>
</target>
- <target name="run-all" depends="run-categories, jtreg" description="Execute QA and Jtreg tests">
- </target>
+ <target name="run-all" depends="run-categories, jtreg" description="Execute QA and Jtreg tests" />
<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="servicediscovery"/>
+ <property name="run.categories"
+ value="id,loader,policyprovider,locatordiscovery,activation,config,discoverymanager,joinmanager,url,iiop,jrmp,reliability,thread,renewalmanager,constraint,export,lookupdiscovery,servicediscovery,io,security,lookupservice,renewalservice,eventmailbox,jeri,start,discoveryservice,discoveryproviders"/>
<testrun>
<!-- Run one or more test categories -->
<arg value="-categories"/>
@@ -310,6 +289,19 @@
</testrun>
</target>
+ <condition property="resultHtmlAvailable">
+ <or>
+ <available file="${result.dir}/index.html"/>
+ <istrue value="${harness.generateHtml}"/>
+ </or>
+ </condition>
+
+ <target name="collect-result" if="resultHtmlAvailable">
+ <zip basedir="${result.dir}" file="${result.dir}/qaresults-${os.arch}-${os.name}-${java.version}.zip" />
+ </target>
+
+ <target name="run" depends="run-categories,collect-result"/>
+
<target name="doc" depends="compile"
description="Generate javadoc documentation">
<delete dir="${doc.api.dir}" quiet="true"/>