[hibernate-commits] Hibernate SVN: r12824 - core/branches/Branch_3_2.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2007-07-26 12:33:54 -0400 (Thu, 26 Jul 2007)
New Revision: 12824

Modified:
   core/branches/Branch_3_2/build.xml
Log:
fork tests

Modified: core/branches/Branch_3_2/build.xml
===================================================================
--- core/branches/Branch_3_2/build.xml	2007-07-26 03:53:09 UTC (rev 12823)
+++ core/branches/Branch_3_2/build.xml	2007-07-26 16:33:54 UTC (rev 12824)
@@ -91,7 +91,6 @@
     </path>
     <!-- allows external definition of the JDBC classpath fragment -->
     <property name="hibernate.test.jdbc.fs.importFile" value="doNotImport" />
-    <import file="${hibernate.test.jdbc.fs.importFile}" optional="true" />
 
     <!-- patternset for insturmentation-eligible resources -->
 	<patternset id="ps.instrument.domain">
@@ -99,6 +98,9 @@
         <exclude name="**/*.hbm.xml" />
     </patternset>
 
+    <!-- Define default test suite parameters -->
+    <property name="hibernate.junit.forkmode" value="perBatch"/>
+    <property name="hibernate.junit.timeout" value="2147483647"/>
 
     <!-- ################################################################## -->
     <!-- ############################# Tasks ############################## -->
@@ -283,7 +285,7 @@
             <pathelement path="${dir.props}"/>
         </path>
 
-        <junit printsummary="yes" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="perBatch">
+        <junit printsummary="yes" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="${hibernate.junit.forkmode}" timeout="${hibernate.junit.timeout}">
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
@@ -311,7 +313,7 @@
 
     <target name="junit.instrument.cglib" depends="instrument.cglib">
         <mkdir dir="${dir.out.junit}"/>
-		<junit printsummary="yes" maxmemory="256M" fork="yes">
+		<junit printsummary="yes" maxmemory="256M" fork="yes" timeout="${hibernate.junit.timeout}">
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
@@ -333,7 +335,7 @@
 
     <target name="junit.instrument.javassist" depends="instrument.javassist">
         <mkdir dir="${dir.out.junit}"/>
-		<junit printsummary="yes" maxmemory="256M" fork="yes">
+		<junit printsummary="yes" maxmemory="256M" fork="yes" timeout="${hibernate.junit.timeout}">
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
@@ -357,7 +359,7 @@
 	<target name="junitsingle" depends="cleantestdb,compiletest" description="Run a single test suite (requires testname and jar.driver properties)">
         <delete dir="${dir.out.junit}"/>
         <mkdir dir="${dir.out.junit}"/>
-        <junit printsummary="yes" fork="yes" haltonfailure="yes" dir="${basedir}">
+        <junit printsummary="yes" fork="yes" haltonfailure="yes" dir="${basedir}" timeout="${hibernate.junit.timeout}">
 			<classpath>
                 <fileset refid="fs.lib" />
                 <path refid="path.jdbc" />