[jboss-svn-commits] JBL Code SVN: r29815 - in labs/jbosstm/trunk: ArjunaCore/arjuna and 3 other directories.

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

Author: adinn
Date: 2009-10-26 12:10:31 -0400 (Mon, 26 Oct 2009)
New Revision: 29815

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/reaper.txt
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/reaper/ReaperTestCase.java
   labs/jbosstm/trunk/ext/byteman.jar
   labs/jbosstm/trunk/sharedbuild.xml
Log:
modified to use latest (1.1.1) byteman jar and to reinstate reaper test cases in order to cope with changes introduced as part of JBTM-624

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2009-10-26 14:59:44 UTC (rev 29814)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2009-10-26 16:10:31 UTC (rev 29815)
@@ -75,24 +75,24 @@
             </tests>
         </run.tests.macro>
         <!-- reaper tests run using script reaper.txt -->
-        <!--<run.tests.macro script="reaper.txt">-->
-            <!--<tests>-->
-                <!--<fileset dir="tests/classes">-->
-                    <!--<include name="**/reaper/ReaperMonitorTest.java"/>-->
-                    <!--<include name="**/reaper/ReaperTestCase.java"/>-->
-                    <!--<include name="**/reaper/ReaperTestCase2.java"/>-->
-                    <!--<include name="**/reaper/ReaperTestCase3.java"/>-->
-                <!--</fileset>-->
-            <!--</tests>-->
-            <!--  -->
+        <run.tests.macro script="reaper.txt">
+            <tests>
+                <fileset dir="tests/classes">
+                    <include name="**/reaper/ReaperMonitorTest.java"/>
+                    <include name="**/reaper/ReaperTestCase.java"/>
+                    <include name="**/reaper/ReaperTestCase2.java"/>
+                    <include name="**/reaper/ReaperTestCase3.java"/>
+                </fileset>
+            </tests>
+
             <!--<additional.jvmargs>-->
                 <!--<jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>-->
                 <!--<jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>-->
                 <!--<jvmarg value="-Xdebug"/>-->
                 <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
             <!--</additional.jvmargs>-->
-            <!-- -->
-        <!--</run.tests.macro>-->
+             
+        </run.tests.macro>
         <!-- object store tests run using script objectstore.txt -->
         <run.tests.macro script="objectstore.txt">
             <tests>

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/reaper.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/reaper.txt	2009-10-26 14:59:44 UTC (rev 29814)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/byteman-scripts/reaper.txt	2009-10-26 16:10:31 UTC (rev 29815)
@@ -185,7 +185,7 @@
 AFTER CALL interrupt
 BIND NOTHING
 IF TRUE
-DO debug("reaper called interrupt on " + $e),
+DO debug("reaper called interrupt on " + $reaperElement),
    flag("interrupted")
 ENDRULE
 
@@ -195,7 +195,7 @@
 AFTER WRITE _zombieCount
 BIND NOTHING
 IF TRUE
-DO debug("reaper incremented zombie count " + $e),
+DO debug("reaper incremented zombie count " + $reaperElement),
    flag("zombied")
 ENDRULE
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/reaper/ReaperTestCase.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/reaper/ReaperTestCase.java	2009-10-26 14:59:44 UTC (rev 29814)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/reaper/ReaperTestCase.java	2009-10-26 16:10:31 UTC (rev 29815)
@@ -42,10 +42,7 @@
     public void testReaper() throws Exception
     {
 
-        // test set+readback of interval
         TransactionReaper reaper = TransactionReaper.transactionReaper();
-        // set value is ignored in default DYNAMIC mode, it uses max long instead.
-        assertEquals(Long.MAX_VALUE, reaper.checkingPeriod());
 
 
         Reapable reapable = new MockReapable(new Uid());

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

Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml	2009-10-26 14:59:44 UTC (rev 29814)
+++ labs/jbosstm/trunk/sharedbuild.xml	2009-10-26 16:10:31 UTC (rev 29815)
@@ -417,6 +417,7 @@
                 </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/>
@@ -425,7 +426,7 @@
                         <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="-javaagent:${global.ext.lib.dir}/byteman.jar=script:${basedir}/tests/byteman-scripts/@{script},listener:true,boot:${global.ext.lib.dir}/byteman.jar"/>
                         <jvmarg value="-Dorg.jboss.byteman.debug"/>
                         <additional.jvmargs/>
                     </additional.jvmargs.aux>
@@ -451,7 +452,7 @@
         <copy file="${sharedbuild.base.dir}/ArjunaCore/arjuna/etc/log4j.properties" todir="${build.dir}/classes"/>
 
         <mkdir dir="${build.dir}/testresults"/>
-        <junit printsummary="yes" fork="yes" dir="${build.dir}" showoutput="@{showoutput}">
+        <junit printsummary="yes" fork="yes" dir="${build.dir}" showoutput="@{showoutput}" >
             <formatter type="plain"/>
             <classpath>
                 <pathelement location="etc"/>