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/09/28 00:14:12 UTC
svn commit: r819416 - in /incubator/river/jtsk/trunk: ./ common.xml
qa/build.xml qa/jtreg/
Author: jcosters
Date: Sun Sep 27 22:14:12 2009
New Revision: 819416
URL: http://svn.apache.org/viewvc?rev=819416&view=rev
Log:
RIVER-304,RIVER-319: Adds basic support for running jtreg tests from Ant build process (i.e. 'ant jtreg' from qa/)
Modified:
incubator/river/jtsk/trunk/ (props changed)
incubator/river/jtsk/trunk/common.xml
incubator/river/jtsk/trunk/qa/build.xml
incubator/river/jtsk/trunk/qa/jtreg/ (props changed)
Propchange: incubator/river/jtsk/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 27 22:14:12 2009
@@ -1,10 +1,11 @@
classes
lib-ext
lib
-deps
+build.properties
configentry
+deps
nbproject
-build
.*
+build
lib-dl
dist
Modified: incubator/river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/common.xml?rev=819416&r1=819415&r2=819416&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/common.xml (original)
+++ incubator/river/jtsk/trunk/common.xml Sun Sep 27 22:14:12 2009
@@ -18,8 +18,11 @@
!-->
<project name="common" default="" basedir=".">
+ <!-- Root of the River source distribution -->
+ <property name="root" location="." />
+
<!-- User specific settings -->
- <property file="build.properties" />
+ <property file="${root}/build.properties" />
<!-- Product version info -->
<property name="version" value="2.1.1"/>
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=819416&r1=819415&r2=819416&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Sun Sep 27 22:14:12 2009
@@ -133,6 +133,24 @@
</javac-cmd>
</target>
+ <target name="jtreg" depends="" description="Run jtreg tests">
+ <!-- TODO: refine classpath -->
+ <property name="jtreg.classpath" refid="river.classpath" />
+ <!-- location of the River jtreg tests -->
+ <property name="jtreg.dir" location="jtreg" />
+ <!-- location of the jtreg distribution, override in <river root>/build.properties -->
+ <property name="jtreg.home" location="/opt/jtreg" />
+ <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
+ classpath="${jtreg.home}/lib/jtreg.jar" />
+ <jtreg dir="${jtreg.dir}" verbose="all" >
+ <!--<arg value="-cpa:${jtreg.classpath}" />-->
+ <!--<arg value="-check" />-->
+ <arg value="-Xbootclasspath/a:${jtreg.classpath}" />
+ <!-- add any number of directory names -->
+ <!--<arg value="net/jini/url" />-->
+ </jtreg>
+ </target>
+
<macrodef name="testrun">
<element name="tr-elements" optional="true" implicit="true"/>
<sequential>
Propchange: incubator/river/jtsk/trunk/qa/jtreg/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 27 22:14:12 2009
@@ -0,0 +1,2 @@
+JTreport
+JTwork