[jboss-svn-commits] JBL Code SVN: r37479 - labs/jbosstm/branches/JBOSSTS_4_15_0_Final.

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

Author: tomjenkinson
Date: 2011-09-26 04:56:40 -0400 (Mon, 26 Sep 2011)
New Revision: 37479

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/Build.txt
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/sharedbuild.xml
Log:
JBTM-903 updated to add a simple mechanism - similar to maven - to -DskipTests=true

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/Build.txt
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/Build.txt	2011-09-26 08:55:50 UTC (rev 37478)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/Build.txt	2011-09-26 08:56:40 UTC (rev 37479)
@@ -67,3 +67,5 @@
 
 A handful of unit tests build and run as part of the normal build. Most test coverage is in the form of integration
 tests which reside in the qa/ directory. These are built but not run automatically. See qa/README.txt for usage.
+
+To skip the tests that run as part of the normal build, you can specify: ant -DskipTests=true

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/sharedbuild.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/sharedbuild.xml	2011-09-26 08:55:50 UTC (rev 37478)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/sharedbuild.xml	2011-09-26 08:56:40 UTC (rev 37479)
@@ -486,29 +486,37 @@
        	</copy>
 
         <mkdir dir="${build.dir}/testresults"/>
-        <junit printsummary="yes" fork="yes" dir="${build.dir}" showoutput="@{showoutput}" includeantruntime="true">
-            <formatter type="plain"/>
-            <classpath>
-                <pathelement location="etc"/>
-                <pathelement location="${build.dir}/lib/${modulename}.jar"/>
-                <pathelement location="${build.dir}/classes/"/>
-                <pathelement location="${build.dir}/tests/"/>
-                <fileset dir="${build.dir}/lib/ext/" includes="*"/>
-                <fileset dir="${basedir}" includes="${lib.dir}/ext/*"/>
-                <fileset dir="${global.ext.lib.dir}" includes="${global.ext.libs}"/>
-                <fileset dir="${global.ext.lib.dir}" includes="${global.ext.test.libs}"/>
-                <fileset dir="${global.ext.lib.dir}" includes="jboss-logging.jar,log4j.jar"/>
-                <additional.classpath.aux/>
-                <path refid="emma.lib" />
-                <path refid="byteman.lib" />
-            </classpath>
 
-            <batchtest haltonerror="yes" haltonfailure="yes" fork="yes" todir="${build.dir}/testresults">
-                <tests.aux/>
-            </batchtest>
+        <if>
+          <not>
+            <istrue value="${skipTests}"/>
+          </not>
+          <then>
+            <junit printsummary="yes" fork="yes" dir="${build.dir}" showoutput="@{showoutput}" includeantruntime="true">
+              <formatter type="plain"/>
+              <classpath>
+                  <pathelement location="etc"/>
+                  <pathelement location="${build.dir}/lib/${modulename}.jar"/>
+                  <pathelement location="${build.dir}/classes/"/>
+                  <pathelement location="${build.dir}/tests/"/>
+                  <fileset dir="${build.dir}/lib/ext/" includes="*"/>
+                  <fileset dir="${basedir}" includes="${lib.dir}/ext/*"/>
+                  <fileset dir="${global.ext.lib.dir}" includes="${global.ext.libs}"/>
+                  <fileset dir="${global.ext.lib.dir}" includes="${global.ext.test.libs}"/>
+                  <fileset dir="${global.ext.lib.dir}" includes="jboss-logging.jar,log4j.jar"/>
+                  <additional.classpath.aux/>
+                  <path refid="emma.lib" />
+                  <path refid="byteman.lib" />
+              </classpath>
 
-	        <additional.jvmargs.aux/>
-        </junit>
+              <batchtest haltonerror="yes" haltonfailure="yes" fork="yes" todir="${build.dir}/testresults">
+                  <tests.aux/>
+              </batchtest>
+
+	            <additional.jvmargs.aux/>
+            </junit>
+          </then>
+        </if>
         </sequential>
 
     </macrodef>