[jboss-svn-commits] JBL Code SVN: r27941 - in labs/jbosstm/trunk: ext and 1 other directory.

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

Author: adinn
Date: 2009-07-13 05:05:29 -0400 (Mon, 13 Jul 2009)
New Revision: 27941

Added:
   labs/jbosstm/trunk/ext/byteman.jar
Modified:
   labs/jbosstm/trunk/ext/Readme
   labs/jbosstm/trunk/sharedbuild.xml
Log:
added support for running junit tests with byteman - fix for JBTM-576

Modified: labs/jbosstm/trunk/ext/Readme
===================================================================
--- labs/jbosstm/trunk/ext/Readme	2009-07-13 08:35:51 UTC (rev 27940)
+++ labs/jbosstm/trunk/ext/Readme	2009-07-13 09:05:29 UTC (rev 27941)
@@ -38,3 +38,4 @@
 xalan.jar
 xercesImpl.jar		Xerces 2.3.0
 xmlParserAPIs.jar	Xerces 2.3.0
+byteman.jar		1.0.3.SNAPSHOT (13 July 2009)

Added: labs/jbosstm/trunk/ext/byteman.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosstm/trunk/ext/byteman.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml	2009-07-13 08:35:51 UTC (rev 27940)
+++ labs/jbosstm/trunk/sharedbuild.xml	2009-07-13 09:05:29 UTC (rev 27941)
@@ -372,10 +372,52 @@
     <target name="run.tests"/>
 
     <macrodef name="run.tests.macro">
-
+        <attribute name="script" default=""/>
         <element name="tests"/>
         <element name="additional.classpath" optional="true"/>
+        <element name="additional.jvmargs" optional="true"/>
+        <sequential>
+	    <if>
+            <equals  arg1="@{script}" arg2=""/>
+            <then>
+                <run.tests.macro.aux>
+                    <tests.aux>
+                        <tests/>
+                    </tests.aux>
+                    <additional.classpath.aux>
+                        <additional.classpath/>
+                    </additional.classpath.aux>
+                    <additional.jvmargs.aux>
+                        <additional.jvmargs/>
+                    </additional.jvmargs.aux>
+                </run.tests.macro.aux>
+            </then>
+            <else>
+                <run.tests.macro.aux>
+                    <tests.aux>
+                        <tests/>
+                    </tests.aux>
+                    <additional.classpath.aux>
+                        <additional.classpath/>
+                    </additional.classpath.aux>
+                    <additional.jvmargs.aux>
+                        <jvmarg value="-javaagent:${global.ext.lib.dir}/byteman.jar=script:${basedir}/tests/byteman-scripts/@{script}"/>
+                        <jvmarg value="-Dorg.jboss.byteman.debug"/>
+                        <additional.jvmargs/>
+                    </additional.jvmargs.aux>
+                </run.tests.macro.aux>
+            </else>
+        </if>
+        </sequential>
 
+    </macrodef>
+
+    <macrodef name="run.tests.macro.aux">
+
+        <element name="tests.aux"/>
+        <element name="additional.classpath.aux" optional="true"/>
+        <element name="additional.jvmargs.aux" optional="true"/>
+
         <sequential>
 
         <echo file="${build.dir}/tests/jbossts-properties.xml"
@@ -395,18 +437,17 @@
                 <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="commons-logging-1.1.jar,log4j*"/>
-                <additional.classpath/>
+                <additional.classpath.aux/>
             </classpath>
 
             <batchtest haltonerror="yes" haltonfailure="yes" fork="yes" todir="${build.dir}/testresults">
-                <tests/>
+                <tests.aux/>
             </batchtest>
 
-            <!--<jvmarg value="-Xdebug"/>-->
-            <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"/>-->
+	        <additional.jvmargs.aux/>
         </junit>
         </sequential>
 
     </macrodef>
 
-</project>
\ No newline at end of file
+</project>