[hibernate-commits] Hibernate SVN: r10287 - trunk/Hibernate3

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2006-08-18 17:46:07 -0400 (Fri, 18 Aug 2006)
New Revision: 10287

Modified:
   trunk/Hibernate3/build.xml
Log:
fix issue with running junit target on in-process hsqldb instance

Modified: trunk/Hibernate3/build.xml
===================================================================
--- trunk/Hibernate3/build.xml	2006-08-18 21:46:07 UTC (rev 10286)
+++ trunk/Hibernate3/build.xml	2006-08-18 21:46:07 UTC (rev 10287)
@@ -41,7 +41,7 @@
 	<property name="dir.eg" value="eg"/>
     <property name="dir.props" value="${dir.etc}" />
 
-    <!-- Define the layout of the output directories -->
+    <!-- Define the build directory layout -->
     <property name="dir.build" value="build" />
     <property name="dir.out.classes" value="${dir.build}/classes" />
     <property name="dir.out.test-classes" value="${dir.build}/testclasses" />
@@ -249,7 +249,13 @@
 		</junitreport>
 	</target>
 
-    <target name="junit" depends="junit.standard,junit.instrument" />
+    <target name="junit" depends="junit.prepare">
+        <sequential>
+            <antcall target="junit.standard" />
+            <antcall target="junit.instrument.cglib" />
+            <antcall target="junit.instrument.javassist" />
+        </sequential>
+    </target>
 
     <target name="junit.prepare" depends="cleantestdb,compiletest">
         <delete dir="${dir.out.junit}"/>
@@ -298,7 +304,7 @@
 
     <target name="junit.instrument.cglib" depends="instrument.cglib">
         <mkdir dir="${dir.out.junit}"/>
-		<junit printsummary="yes" maxmemory="256M" fork="no">
+		<junit printsummary="yes" maxmemory="256M" fork="yes">
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
@@ -321,7 +327,7 @@
 
     <target name="junit.instrument.javassist" depends="instrument.javassist">
         <mkdir dir="${dir.out.junit}"/>
-		<junit printsummary="yes" maxmemory="256M" fork="no">
+		<junit printsummary="yes" maxmemory="256M" fork="yes">
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />