[jboss-cvs] JBossAS SVN: r70539 - projects/aop/trunk/aop.

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

Author: kabir.khan at jboss.com
Date: 2008-03-07 07:46:52 -0500 (Fri, 07 Mar 2008)
New Revision: 70539

Modified:
   projects/aop/trunk/aop/base-tests.xml
   projects/aop/trunk/aop/build-tests-jdk14.xml
   projects/aop/trunk/aop/build-tests-jdk50.xml
Log:
[JBAOP-528] Only run the duplicatemethod test with loadtime weaving

Modified: projects/aop/trunk/aop/base-tests.xml
===================================================================
--- projects/aop/trunk/aop/base-tests.xml	2008-03-07 11:52:00 UTC (rev 70538)
+++ projects/aop/trunk/aop/base-tests.xml	2008-03-07 12:46:52 UTC (rev 70539)
@@ -85,9 +85,6 @@
       <antcall target="${test-target}" inheritRefs="true">
          <param name="test" value="bridgemethod"/>
       </antcall>
-      <antcall target="${test-target}" inheritRefs="true">
-         <param name="test" value="duplicatemethod"/>
-      </antcall>
       <!--
       <antcall target="${test-target}" inheritRefs="true">
          <param name="test" value="rebuildingchain"/>

Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml	2008-03-07 11:52:00 UTC (rev 70538)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml	2008-03-07 12:46:52 UTC (rev 70539)
@@ -312,7 +312,7 @@
       <antcall target="clean"/>
       <antcall target="precompiled-tests" inheritRefs="true"/>
      <antcall target="system-classloader-test" inheritRefs="true"/>
- 
+
       <antcall target="clean"/>
       <antcall target="precompiled-genadvisor-tests" inheritRefs="true"/>
 
@@ -344,6 +344,10 @@
          <param name="caller" value="bootclasspath-tests"/>
          <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
       </antcall>
+      <antcall target="_run-bootclasspath-test" inheritRefs="true">
+         <param name="test" value="duplicatemethod"/>
+         <param name="caller" value="bootclasspath-tests"/>
+      </antcall>
    </target>
 
    <!-- ==================================================================================== -->
@@ -368,6 +372,10 @@
          <param name="test" value="nameddomain"/>
          <param name="caller" value="bootclasspath-genadvisor-tests"/>
       </antcall>
+      <antcall target="_run-bootclasspath-test" inheritRefs="true">
+         <param name="test" value="duplicatemethod"/>
+         <param name="caller" value="bootclasspath-genadvisor-tests"/>
+      </antcall>
 
       <!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
       <antcall target="_base-tests" inheritRefs="true">

Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml	2008-03-07 11:52:00 UTC (rev 70538)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml	2008-03-07 12:46:52 UTC (rev 70539)
@@ -356,6 +356,11 @@
          <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
       </antcall>
 
+      <antcall target="_run-javaagent-test" inheritRefs="true">
+         <param name="test" value="duplicatemethod"/>
+         <param name="caller" value="javaagent-tests"/>
+      </antcall>
+
       <!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
       <antcall target="_base-jdk50-tests" inheritRefs="true">
          <param name="caller" value="javaagent-tests"/>
@@ -382,6 +387,10 @@
          <param name="exclude" value="**/OverrideTestCase.class"/>
       </antcall>
       <antcall target="_run-javaagent-test" inheritRefs="true">
+         <param name="test" value="duplicatemethod"/>
+         <param name="caller" value="javaagent-genadvisor-tests"/>
+      </antcall>
+      <antcall target="_run-javaagent-test" inheritRefs="true">
          <param name="test" value="dynamicgenadvisor"/>
          <param name="caller" value="javaagent-genadvisor-tests"/>
       </antcall>
@@ -1348,12 +1357,17 @@
          <param name="test-target" value="_run-jrockit-test"/>
       </antcall>
 
+
       <!-- Tests only applicable for this weaving mode -->
       <antcall target="_run-jrockit-test" inheritRefs="true">
          <param name="test" value="override"/>
          <param name="caller" value="jrockit-tests"/>
          <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
       </antcall>
+      <antcall target="_run-jrockit-test" inheritRefs="true">
+         <param name="test" value="duplicatemethod"/>
+         <param name="caller" value="jrockit-tests"/>
+      </antcall>
 
    </target>
 
@@ -1382,6 +1396,10 @@
          <param name="caller" value="jrockit-genadvisor-tests"/>
          <param name="exclude" value="**/OverrideTestCase.class"/>
       </antcall>
+      <antcall target="_run-jrockit-test" inheritRefs="true">
+         <param name="test" value="duplicatemethod"/>
+         <param name="caller" value="jrockit-genadvisor-tests"/>
+      </antcall>
    </target>
 
 
@@ -1611,7 +1629,7 @@
       <condition property="extra.classes" value="${extraClasses}" else="">
          <isset property="extraClasses"/>
       </condition>
-      
+
       <aopc compilerclasspathref="aopc.task.classpath">
          <classpath refid="aopc.task.classpath"/>
          <classpath path="${build.tests.classes}"/>