[jboss-svn-commits] JBL Code SVN: r29816 - in labs/jbosstm/trunk: ArjunaCore/arjuna/tests/byteman-scripts and 1 other directories.

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

Author: adinn
Date: 2009-10-26 13:14:27 -0400 (Mon, 26 Oct 2009)
New Revision: 29816

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/objectstore.txt
   labs/jbosstm/trunk/ext/byteman.jar
   labs/jbosstm/trunk/sharedbuild.xml
Log:
added byteman 1.1.1-snapshot jar to get round classloader issues which avoids need to add byteman jar to boot path. also removed trace code from sharedbuild.xml and corrected duplicate name problem with objectstore.txt byteman script -- more fixes for JBTM-624

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/objectstore.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/objectstore.txt	2009-10-26 16:10:31 UTC (rev 29815)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/objectstore.txt	2009-10-26 17:14:27 UTC (rev 29816)
@@ -95,7 +95,7 @@
 # and then delay proceeding with the test until the purge has actually
 # happened
 
-RULE log store recovery test allow purge to proceed
+RULE log store recovery test allow purge to proceed 2
 CLASS com.hp.mwtests.ts.arjuna.objectstore.LogStoreTest2
 METHOD test()
 AT CALL InputObjectState.<init>

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

Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml	2009-10-26 16:10:31 UTC (rev 29815)
+++ labs/jbosstm/trunk/sharedbuild.xml	2009-10-26 17:14:27 UTC (rev 29816)
@@ -417,7 +417,6 @@
                 </run.tests.macro.aux>
             </then>
             <else>
-                <echo  message="running with script ${basedir}/tests/byteman-scripts/@{script}"/>
                 <run.tests.macro.aux  showoutput="@{showoutput}">
                     <tests.aux>
                         <tests/>
@@ -426,7 +425,7 @@
                         <additional.classpath/>
                     </additional.classpath.aux>
                     <additional.jvmargs.aux>
-                        <jvmarg value="-javaagent:${global.ext.lib.dir}/byteman.jar=script:${basedir}/tests/byteman-scripts/@{script},listener:true,boot:${global.ext.lib.dir}/byteman.jar"/>
+                        <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>