Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace hard-coded tck runtime timeout (7200000) to system property jpatck.run.tmo (default to 7200000). 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.1.x@1231189 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Albert Lee 2012-01-13 17:11:57 +00:00
parent 4f6277057e
commit 7b94014ca4
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openjpa-integration/tck/pom.xml
View File

@ -41,6 +41,9 @@
but you can also test against prior levels by setting:
-Dtck2.level=20091209
To set the TCK run time limit, use the "jpatck.run.tmo" system property to
specify the timeout value in milliseconds. Default to 7200000 (2 hours).
To run a specific package of tests, use the "jpatck.pkg.dir" system
property to specify the parent directory of the tests you want to run.
E.g.:

8
openjpa-integration/tck/tck2-20101205.xml
View File

@ -209,8 +209,9 @@ databaseName=${db.name}
<attribute name="dir" default="${tck.dir}/src" />
<attribute name="buildfile" />
<attribute name="target" />
<attribute name="tmo" default="7200000" />
<sequential>
<java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="false" dir="@{dir}" append="true" output="${tck.log}" timeout="7200000" resultproperty="tsant.result">
<java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="false" dir="@{dir}" append="true" output="${tck.log}" timeout="@{tmo}" resultproperty="tsant.result">
<arg value="-emacs" />
<arg value="-buildfile" />
<arg value="@{buildfile}" />
@ -311,17 +312,18 @@ databaseName=${db.name}
<tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />
<echo>TCK initdb.xml returned result=${tsant.result}</echo>
<property name="jpatck.run.tmo" value="7200000" />
<!-- now run the TCK -->
<if>
<isset property="jpatck.pkg.dir" />
<then>
<echo>Calling TCK build.xml for pkg.dir=${jpatck.pkg.dir}</echo>
<property name="dir" value="${tck.dir}/src/${jpatck.pkg.dir}" />
<tsant dir="${dir}" buildfile="${dir}/build.xml" target="runclient" />
<tsant dir="${dir}" buildfile="${dir}/build.xml" target="runclient" tmo="${jpatck.run.tmo}" />
</then>
<else>
<echo>Calling TCK build.xml for ALL tests</echo>
<tsant buildfile="${tck.dir}/bin/build.xml" target="run.all.tests" />
<tsant buildfile="${tck.dir}/bin/build.xml" target="run.all.tests" tmo="${jpatck.run.tmo}" />
</else>
</if>