You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2006/03/17 23:31:25 UTC
svn commit: r386743 - in /db/jdo/trunk/tck20: maven.xml
src/conf/configurations.list src/conf/runonce.conf src/conf/signatures.conf
Author: clr
Date: Fri Mar 17 14:31:24 2006
New Revision: 386743
URL: http://svn.apache.org/viewcvs?rev=386743&view=rev
Log:
JDO-299 Changed maven.xml to run signature test only once
Added:
db/jdo/trunk/tck20/src/conf/runonce.conf
Removed:
db/jdo/trunk/tck20/src/conf/signatures.conf
Modified:
db/jdo/trunk/tck20/maven.xml
db/jdo/trunk/tck20/src/conf/configurations.list
Modified: db/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/maven.xml?rev=386743&r1=386742&r2=386743&view=diff
==============================================================================
--- db/jdo/trunk/tck20/maven.xml (original)
+++ db/jdo/trunk/tck20/maven.xml Fri Mar 17 14:31:24 2006
@@ -113,6 +113,8 @@
<j:set var="zeroval" value="0"/>
<j:set var="spaceval" value=" "/>
<j:set var="nullval" value=""/>
+ <j:set var="true" value="true"/>
+ <j:set var="false" value="false"/>
<j:set var="cfglist" value="${jdo.tck.cfglist}"/>
<j:if test="${cfglist == null}">
@@ -263,24 +265,29 @@
</tstamp>
<mkdir dir="${jdo.tck.log.directory}/${timestamp}/configuration"/>
<echo>Run all configurations on iut</echo>
+ <j:set var="runOnceTestRanOnce" value="false"/>
<j:forEach var="jdo.tck.database" items="${jdo.tck.dblist}">
<j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
<j:forEach var="jdo.tck.cfg" items="${jdo.tck.cfglist}">
- <!-- get jdo.tck.classes (list of testclasses),
- jdo.tck.testdata, jdo.tck.mapping -->
+ <j:set var="runOnce" value="false"/>
<u:properties file="${basedir}/src/conf/${jdo.tck.cfg}"/>
- <attainGoal name="exclude"/>
- <j:new var="schemaname" className="java.lang.String"/>
- <j:set var="id" value="${jdo.tck.identitytype}"/>
- <j:set var="mapping" value="${jdo.tck.mapping}"/>
- <j:if test="${mapping == zeroval}">
- <j:set var="jdo.tck.mapping" value=""/>
+ <j:if test="${runOnce == false || (runOnce == true && runOnceTestRanOnce == false)}">
+ <attainGoal name="exclude"/>
+ <j:new var="schemaname" className="java.lang.String"/>
+ <j:set var="id" value="${jdo.tck.identitytype}"/>
+ <j:set var="mapping" value="${jdo.tck.mapping}"/>
+ <j:if test="${mapping == zeroval}">
+ <j:set var="jdo.tck.mapping" value=""/>
+ </j:if>
+ <j:set var="schemaname">
+ <j:expr value="${schemaname.concat(id)}"/>
+ <j:expr value="${schemaname.concat(mapping)}"/>
+ </j:set>
+ <attainGoal name="doRuntck.iut"/>
+ <j:if test="${runOnce == true}">
+ <j:set var="runOnceTestRanOnce" value="true"/>
+ </j:if>
</j:if>
- <j:set var="schemaname">
- <j:expr value="${schemaname.concat(id)}"/>
- <j:expr value="${schemaname.concat(mapping)}"/>
- </j:set>
- <attainGoal name="doRuntck.iut"/>
</j:forEach>
</j:forEach>
</j:forEach>
@@ -304,23 +311,32 @@
<format property="timestamp" pattern="yyyyMMdd-HHmmss"/>
</tstamp>
<mkdir dir="${jdo.tck.log.directory}/${timestamp}/configuration"/>
+
+
<echo>Run all configurations on jdori</echo>
+ <j:set var="runOnceTestRanOnce" value="false"/>
<j:forEach var="jdo.tck.database" items="${jdo.tck.dblist}">
<j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
<j:forEach var="jdo.tck.cfg" items="${jdo.tck.cfglist}">
+ <j:set var="runOnce" value="false"/>
<u:properties file="${basedir}/src/conf/${jdo.tck.cfg}"/>
- <attainGoal name="exclude"/>
- <j:new var="schemaname" className="java.lang.String"/>
- <j:set var="id" value="${jdo.tck.identitytype}"/>
- <j:set var="mapping" value="${jdo.tck.mapping}"/>
- <j:if test="${mapping == zeroval}">
- <j:set var="jdo.tck.mapping" value=""/>
+ <j:if test="${runOnce == false || (runOnce == true && runOnceTestRanOnce == false)}">
+ <attainGoal name="exclude"/>
+ <j:new var="schemaname" className="java.lang.String"/>
+ <j:set var="id" value="${jdo.tck.identitytype}"/>
+ <j:set var="mapping" value="${jdo.tck.mapping}"/>
+ <j:if test="${mapping == zeroval}">
+ <j:set var="jdo.tck.mapping" value=""/>
+ </j:if>
+ <j:set var="schemaname">
+ <j:expr value="${schemaname.concat(id)}"/>
+ <j:expr value="${schemaname.concat(mapping)}"/>
+ </j:set>
+ <attainGoal name="doRuntck.jdori"/>
+ <j:if test="${runOnce == true}">
+ <j:set var="runOnceTestRanOnce" value="true"/>
+ </j:if>
</j:if>
- <j:set var="schemaname">
- <j:expr value="${schemaname.concat(id)}"/>
- <j:expr value="${schemaname.concat(mapping)}"/>
- </j:set>
- <attainGoal name="doRuntck.jdori"/>
</j:forEach>
</j:forEach>
</j:forEach>
@@ -350,6 +366,7 @@
<echo>JVM will wait until debugger attaches on port ${jdo.tck.debug.port}...</echo>
</j:if>
+ <echo>Starting configuration="${jdo.tck.cfg}" with database="${jdo.tck.database}" identitytype="${jdo.tck.identitytype}" mapping="${jdo.tck.mapping}".</echo>
<java fork="yes" dir="${jdo.tck.testdir}"
classname="${jdo.tck.testrunnerclass}">
<classpath refid="this.iut.classpath"/>
@@ -416,6 +433,7 @@
<echo>JVM will wait until debugger attaches on port ${jdo.tck.debug.port}...</echo>
</j:if>
+ <echo>Starting configuration="${jdo.tck.cfg}" with database="${jdo.tck.database}" identitytype="${jdo.tck.identitytype}" mapping="${jdo.tck.mapping}".</echo>
<java fork="yes" dir="${jdo.tck.testdir}"
classname="${jdo.tck.testrunnerclass}">
<classpath refid="this.jdori.classpath"/>
Modified: db/jdo/trunk/tck20/src/conf/configurations.list
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/configurations.list?rev=386743&r1=386742&r2=386743&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/configurations.list (original)
+++ db/jdo/trunk/tck20/src/conf/configurations.list Fri Mar 17 14:31:24 2006
@@ -1,4 +1,5 @@
jdo.tck.cfglist = \
+ runonce.conf \
instancecallbacks.conf \
jdohelper.conf \
pm.conf \
Added: db/jdo/trunk/tck20/src/conf/runonce.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/runonce.conf?rev=386743&view=auto
==============================================================================
--- db/jdo/trunk/tck20/src/conf/runonce.conf (added)
+++ db/jdo/trunk/tck20/src/conf/runonce.conf Fri Mar 17 14:31:24 2006
@@ -0,0 +1,9 @@
+jdo.tck.description = Verification of the JDO API classes and interfaces
+jdo.tck.testdata =
+jdo.tck.standarddata =
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+# The runOnce flag must only be set in this configuration and no others
+runOnce = true
+jdo.tck.classes = \
+org.apache.jdo.tck.api.SignatureTest