[jboss-svn-commits] JBL Code SVN: r7880 - in labs/jbossesb/trunk/qa: . junit

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2006-11-28 10:02:31 -0500 (Tue, 28 Nov 2006)
New Revision: 7880

Modified:
   labs/jbossesb/trunk/qa/build.xml
   labs/jbossesb/trunk/qa/junit/build.xml
Log:
Updated for CI build

Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml	2006-11-28 14:12:21 UTC (rev 7879)
+++ labs/jbossesb/trunk/qa/build.xml	2006-11-28 15:02:31 UTC (rev 7880)
@@ -4,11 +4,16 @@
 	<property file="../product/install/deployment.properties" />
 
 	<target name="test" depends="test.junit" description="Run all QA tests." />
+	<target name="ci-test" depends="ci-test.junit" description="Run all QA tests." />
 	
 	<target name="test.junit" description="Run JUnit based QA tests.">
 		<ant dir="junit" target="test" />
 	</target>
 
+	<target name="ci-test.junit" description="Run JUnit based QA tests.">
+		<ant dir="junit" target="ci-test" />
+	</target>
+
 	<target name="clean" description="Clean the QA env">
 		<echo message="Cleaning..."/>
 		

Modified: labs/jbossesb/trunk/qa/junit/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/build.xml	2006-11-28 14:12:21 UTC (rev 7879)
+++ labs/jbossesb/trunk/qa/junit/build.xml	2006-11-28 15:02:31 UTC (rev 7880)
@@ -11,6 +11,7 @@
 	<property name="qa.junit.src" value="src"/>
 	<property name="qa.junit.classes" value="${qa.build}/junit/classes"/>
 	<property name="qa.junit.report" value="${qa.build}/junit/report" />
+        <property name="qa.junit.memory" value="128m"/>
 
 	<path id="base.cp">
 		<fileset dir="${build.lib}/ext"
@@ -31,20 +32,20 @@
 		<path refid="base.cp"/>
 	</path>
 	
-	<target name="test">
+	<target name="test" depends="compile, prompt, execute"/>
+	<target name="ci-test" depends="compile, execute"/>
+
+	<target name="compile">
 		<echo message="Running JUnit based QA tests..."/>
 		
 		<!-- Build the tests... -->
 		<mkdir dir="${qa.junit.classes}"/>
 		<javac srcdir="${qa.junit.src}" destdir="${qa.junit.classes}" classpathref="qa.junit.cp" debug="on" />
+	</target>
 
-		<echo message="" />
-		<echo message="" />
-		<input message='Which tests? (Press return to run all tests - Wildcards Supported - already assumes test cases end with the "Test" suffix)' 
-			addproperty="tests.filter"
-			defaultvalue="*"/>
-		
+	<target name="execute">
 		<!-- Run the tests... -->
+		<property name="tests.filter" value="*"/>
 		<mkdir dir="${qa.junit.report}"/>
         <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="yes" fork="true">
             <formatter type="plain" usefile="false"/>
@@ -59,6 +60,7 @@
                 <path refid="qa.junit.cp"/>
                 <pathelement location="${qa.junit.src}"/>
             </classpath>
+            <jvmarg value="-Xmx${qa.junit.memory}"/>
 
         	<!-- Listener Sys Props... -->
         	<sysproperty key="org.jboss.soa.esb.paramsRepository.file.root" value="junit/src" />
@@ -88,20 +90,27 @@
 		
 	</target>
 
-	<target name="test-emma">
+	<target name="test-emma" depends="compile-emma, prompt, execute-emma"/>
+	<target name="ci-test-emma" depends="compile-emma, execute-emma"/>
+
+	<target name="compile-emma">
 		<echo message="Running JUnit based QA tests (with ema enabled) ..."/>
-		
 		<!-- Build the tests... -->
 		<mkdir dir="${qa.junit.classes}"/>
 		<javac srcdir="${qa.junit.src}" destdir="${qa.junit.classes}" classpathref="qa.junit.emma.cp" debug="on" />
+	</target>
 
+	<target name="prompt">
 		<echo message="" />
 		<echo message="" />
 		<input message='Which tests? (Press return to run all tests - Wildcards Supported - already assumes test cases end with the "Test" suffix)' 
 			addproperty="tests.filter"
 			defaultvalue="*"/>
+	</target>
 		
+	<target name="execute-emma">
 		<!-- Run the tests... -->
+		<property name="tests.filter" value="*"/>
 		<mkdir dir="${qa.junit.report}"/>
         <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="yes" fork="true">
             <formatter type="plain" usefile="false"/>
@@ -117,6 +126,7 @@
                 <pathelement location="${qa.junit.src}"/>
             </classpath>
 
+            <jvmarg value="-Xmx${qa.junit.memory}"/>
         	<!-- emma jvm args -->
 			<jvmarg value="-Demma.coverage.out.file=../product/build/tests/coverage/all/coverage.emma" />
 			<jvmarg value="-Demma.coverage.out.merge=true" />